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 #8712

Browse Source
This commit is contained in:
Uwe Stöhr 2016-02-11 23:56:02 +01:00
parent 0bed11d960
commit dc6bc435a4
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/insets/InsetBox.cpp
View File

@ -215,9 +215,21 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
return; return;
} }
cur.recordUndoInset(ATOMIC_UNDO, this); cur.recordUndoInset(ATOMIC_UNDO, this);
if (change_type) if (change_type) {
params_.type = cmd.getArg(1); params_.type = cmd.getArg(1);
else // if (for_box) // set a makebox if there is no inner box but Frameless was exectued
// otherwise the result would be a non existent box (no inner AND outer box)
// (this was LyX bug 8712)
if (params_.type == "Frameless" && !params_.inner_box) {
params_.use_makebox = true;
params_.inner_box = true;
}
// handle the opposite case
if (params_.type == "Boxed" && params_.use_makebox) {
params_.use_makebox = false;
params_.inner_box = false;
}
} else
string2params(to_utf8(cmd.argument()), params_); string2params(to_utf8(cmd.argument()), params_);
setButtonLabel(); setButtonLabel();
break; break;

4
status.21x
View File

@ -142,12 +142,14 @@ What's new
- Do not output returns and tabs in outliner. - Do not output returns and tabs in outliner.
- Fix on-screeb font of starred sections in paper text class. - Fix on-screen font of starred sections in paper text class.
- Fix category of several layouts of the foils text class (UI only). - Fix category of several layouts of the foils text class (UI only).
- Correct minimal size of the view source window (bug 4430). - Correct minimal size of the view source window (bug 4430).
- Fix that changing the box type could delete the box (bug 8712).
* INTERNALS * INTERNALS