commit dc6bc435a42a0174916a915cc9856e4b4b301c60
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Thu Feb 11 23:56:02 2016 +0100
InsetBox.cpp: backport fix for bug #8712
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 30c2386..ea06bfa 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -215,9 +215,21 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
return;
}
cur.recordUndoInset(ATOMIC_UNDO, this);
- if (change_type)
+ if (change_type) {
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_);
setButtonLabel();
break;
diff --git a/status.21x b/status.21x
index 1309bd1..e897791 100644
--- a/status.21x
+++ b/status.21x
@@ -142,12 +142,14 @@ What's new
- 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).
- Correct minimal size of the view source window (bug 4430).
+- Fix that changing the box type could delete the box (bug 8712).
+
* INTERNALS
