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
This commit is contained in:
Martin Vermeer 2003-09-10 14:06:49 +00:00
parent 1331aacf59
commit 22aa494eba
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2003-09-10 Martin Vermeer <martin.vermeer@hut.fi>
* insetcollapsable.C: Simplify by using adjustCommand, and fix bug
in the process
2003-09-09 Lars Gullik Bjønnes <larsbj@lyx.org>
* several files: change Assert to BOOST_ASSERT

View File

@ -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;
}