Fixed calling edit off subinset on a ButtonPress event (fix #214).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3663 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2002-03-05 11:51:07 +00:00
parent b32de13261
commit a2a6509aff
3 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2002-03-05 Juergen Vigna <jug@sad.it>
* insettext.C (insetButtonPress): don't call exit on a InsetButtonPress
only that one in the inset. Should be enough.
* insettabular.C (insetButtonPress): don't hit a sub inset 2 times.
2002-03-04 Lars Gullik Bjønnes <larsbj@birdstep.com>
* insettext.C (clear): a gross hack to set layout on a newly

View File

@ -800,7 +800,9 @@ void InsetTabular::insetButtonPress(BufferView * bv, int x, int y, int button)
return;
}
if (inset_hit && bv->theLockingInset()) {
if (activateCellInsetAbs(bv, x, y, button))
// only activate the Inset so that no internal inset is hit
// by this call. It should be only hit by the insetButtonPress call.
if (activateCellInsetAbs(bv, 0, 0, 0))
the_locking_inset->insetButtonPress(bv,
x - inset_x,
y - inset_y,

View File

@ -924,7 +924,7 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button)
the_locking_inset = 0;
inset->insetButtonPress(bv, x - inset_x,
y - inset_y, button);
inset->edit(bv, x - inset_x, y - inset_y, button);
// inset->edit(bv, x - inset_x, y - inset_y, button);
if (the_locking_inset)
updateLocal(bv, CURSOR, false);
no_selection = false;