From 22aa494ebabea8fada234c91018a4c11a4dadae6 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Wed, 10 Sep 2003 14:06:49 +0000 Subject: [PATCH] Simplify by using adjustCommand, and fix bug in the process git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7730 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 5 +++++ src/insets/insetcollapsable.C | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 1e591c440f..7db0575a15 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-09-10 Martin Vermeer + + * insetcollapsable.C: Simplify by using adjustCommand, and fix bug + in the process + 2003-09-09 Lars Gullik Bjønnes * several files: change Assert to BOOST_ASSERT diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index becba55719..68fe887ab0 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -319,15 +319,14 @@ InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd) bv->buffer()->markDirty(); inset.localDispatch(cmd); } else { - FuncRequest cmd1 = cmd; if (!bv->lockInset(this)) return DISPATCHED; if (cmd.y <= button_dim.y2) { + FuncRequest cmd1 = cmd; cmd1.y = 0; - } else { - cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent()); - } - inset.localDispatch(cmd); + inset.localDispatch(cmd1); + } else + inset.localDispatch(adjustCommand(cmd)); } return DISPATCHED; }