The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 264948348e3b3207ec0edbca41f2a83096a8716f Author: Richard Heck <[email protected]> Date: Sat Apr 14 17:32:25 2012 -0400 Fix bug 8124. We enable LFUN_INSET_MODIFY in InsetBox if it is intended for us, i.e., if the first argument is "box". Maybe we should also check to make sure that the rest of the arguments are good, but we used just to return true no matter what the argument was, so this is an improvement. LFUN_INSET_MODIFY is really kind of a mess. diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 4e00f87..08f950b 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -211,14 +211,20 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, { switch (cmd.action()) { - case LFUN_INSET_MODIFY: - if (cmd.getArg(0) == "changetype") { + case LFUN_INSET_MODIFY: { + string const first_arg = cmd.getArg(0); + if (first_arg == "changetype") { string const type = cmd.getArg(1); flag.setOnOff(type == params_.type); flag.setEnabled(!params_.inner_box || type != "Framed"); return true; } + if (first_arg == "box") { + flag.setEnabled(true); + return true; + } return InsetCollapsable::getStatus(cur, cmd, flag); + } case LFUN_INSET_DIALOG_UPDATE: flag.setEnabled(true); diff --git a/status.20x b/status.20x index a09ba9e..f09f013 100644 --- a/status.20x +++ b/status.20x @@ -122,6 +122,9 @@ What's new - Allow the <Enter> key to add a new branch in document settings. Only <Ctrl+Enter> and numpad-<Enter> will also close the dialog. +- Box settings dialog didn't work if you were actually inside the box + (bug 8124). + - Fix tooltip for "Use Non-TeX Fonts" (bug 7787). - Fix pasting of LATIN CAPITAL LETTER SHARP S (bug 8057). ----------------------------------------------------------------------- Summary of changes: src/insets/InsetBox.cpp | 10 ++++++++-- status.20x | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
