anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InsetBox.cpp: backport fix for bug #7849

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39969 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-10-25 17:59:24 +00:00
parent 7422d6ad4e
commit d98eb6e4f1
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/insets/InsetBox.cpp
View File

@ -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{";

2
status.20x
View File

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