From d98eb6e4f1b9a3e7880bceca5bbb73cc41e95499 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 25 Oct 2011 17:59:24 +0000 Subject: [PATCH] InsetBox.cpp: backport fix for bug #7849 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39969 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetBox.cpp | 14 +++++++++----- status.20x | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index ec11374496..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); @@ -309,7 +312,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const os << "\\shadowbox{"; break; case Shaded: - // later + // must be set later becaue e.g. the width settings only work when + // it is inside a minipage or parbox break; case Doublebox: os << "\\doublebox{"; diff --git a/status.20x b/status.20x index 1670f28ac0..07fd81b76e 100644 --- a/status.20x +++ b/status.20x @@ -52,6 +52,8 @@ What's new text which is not explicitly marked in a different language, irrespective of the multilingual status, except for LTR<=>RTL changes. +- disable impossible settings in context menu of boxes (bug 7849). + - Augmented the tex2lyx --help message with the default paths (bug 6827). - New command-line switch -v (--version) for tex2lyx showing build information -- 2.39.5