GuiBox.cpp:

- fix another bug: shaded boxes can have a specified width when there is an inner box
- code optimizations according to http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg160048.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34532 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index fe270165aaf0cc4512358088a4625d0a0d6ccd29..e2906ed24759cbdb1e6b7cf1afe9715200aa9e89 100644 (file)
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -119,16 +119,13 @@ void GuiBox::on_innerBoxCO_activated(QString const & str)
        ialignCO->setEnabled(ibox);
        halignCO->setEnabled(!ibox);
        heightCB->setEnabled(ibox);
-       // if an outer box from the fancybox LaTeX-package has no inner box,
-       // the width cannot be specified
-       if (!ibox && outer != 0 && outer != 1) {
-               widthED->setEnabled(false);
-               widthUnitsLC->setEnabled(false);
-       } else {
-               widthED->setEnabled(true);
-               widthUnitsLC->setEnabled(true);
-       }
-       pagebreakCB->setEnabled(!ibox && outer == 1);
+       // except for fremeless and boxed, the width cannot be specified if
+       // there is no inner box
+       bool const width_disabled = (!ibox && ids_[outer] != "Frameless" &&
+               ids_[outer] != "Boxed");
+       widthED->setEnabled(!width_disabled);
+       widthUnitsLC->setEnabled(!width_disabled);
+       pagebreakCB->setEnabled(!ibox && ids_[outer] == "Boxed");
        setSpecial(ibox);
        changed();
 }
@@ -149,17 +146,13 @@ void GuiBox::on_typeCO_activated(int index)
        int itype = innerBoxCO->currentIndex();
        if (innerBoxCO->count() == 2)
                ++itype;
-       pagebreakCB->setEnabled(index == 1 && itype == 0);
-       // if an outer box from the fancybox LaTeX-package has no inner box,
-       // the width cannot be specified
-       if (itype == 0
-           && (index == 2 || index == 3 || index == 4 || index == 6)) {
-               widthED->setEnabled(false);
-               widthUnitsLC->setEnabled(false);
-       } else {
-               widthED->setEnabled(index != 5);
-               widthUnitsLC->setEnabled(index != 5);
-       }
+       pagebreakCB->setEnabled(ids_[index] == "Boxed" && itype == 0);
+       // except for fremeless and boxed, the width cannot be specified if
+       // there is no inner box
+       bool const width_disabled = (itype == 0 && ids_[index] != "Frameless"
+               && ids_[index] != "Boxed");
+       widthED->setEnabled(!width_disabled);
+       widthUnitsLC->setEnabled(!width_disabled);
        setInnerType(frameless, itype);
        changed();
 }