commit c391d599d94ee4c6fbe9aac17209f6e236d196db
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun May 10 21:59:35 2015 +0200
GuiBox.cpp: fix button logic (fixes bug #9543)
diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index d3bd8e8..06a15b7 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -177,7 +177,6 @@ void GuiBox::on_typeCO_activated(int index)
// the width can only be selected for makebox or framebox
widthCB->setEnabled(itype == "makebox"
|| (type == "Boxed" && itype == "none"));
- widthCB->setChecked(itype != "none" && !widthCB->isEnabled());
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
bool const width_enabled =
@@ -195,8 +194,11 @@ void GuiBox::on_typeCO_activated(int index)
&& ((itype == "none" && type == "Boxed") || itype
== "makebox"));
// pagebreak is only allowed for Boxed without inner box
pagebreakCB->setEnabled(type == "Boxed" && itype == "none");
- if (type != "Boxed")
+ if (type != "Boxed") {
+ if (type != "Frameless")
+ widthCB->setChecked(itype != "none");
pagebreakCB->setChecked(false);
+ }
changed();
}
diff --git a/status.21x b/status.21x
index 86d19de..22fc9ac 100644
--- a/status.21x
+++ b/status.21x
@@ -197,6 +197,8 @@ What's new
- Update previews after find/replace (bug 7242).
+- Fix button logic in box dialog (bug 9543).
+
* INTERNALS
