From a2a6509aff64e6ae7784bfc8436c874238c8588c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Vigna?= Date: Tue, 5 Mar 2002 11:51:07 +0000 Subject: [PATCH] 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 --- src/insets/ChangeLog | 7 +++++++ src/insets/insettabular.C | 4 +++- src/insets/insettext.C | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 2f11c195a7..86b6be2392 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2002-03-05 Juergen Vigna + + * 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 * insettext.C (clear): a gross hack to set layout on a newly diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 97503089c4..4c8e6014b3 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -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, diff --git a/src/insets/insettext.C b/src/insets/insettext.C index c132216245..8396845fed 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -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; -- 2.39.2