From a517afc28e9e090f8e0f9ab933c8ed9fc92b8253 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Mon, 24 Oct 2011 17:32:29 +0000 Subject: [PATCH] =?utf8?q?InsetBox.cpp:=20fix=20bug=20#7849=20(with=20help?= =?utf8?q?=20from=20J=C3=BCrgen)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39956 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetBox.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 38c864ccbc..ccd1d12107 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -212,10 +212,13 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action()) { case LFUN_INSET_MODIFY: - if (cmd.getArg(0) == "changetype") - flag.setOnOff(cmd.getArg(1) == params_.type); - flag.setEnabled(true); - return true; + if (cmd.getArg(0) == "changetype") { + string const type = cmd.getArg(1); + flag.setOnOff(type == params_.type); + flag.setEnabled(!params_.inner_box || type != "Framed"); + return true; + } + return InsetCollapsable::getStatus(cur, cmd, flag); case LFUN_INSET_DIALOG_UPDATE: flag.setEnabled(true); -- 2.39.5