work around a Qt bug in 3.1.2, fixing bug 1136

JMarc, this applies to 1.3.3 as well. Do you want it ?

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 3dbb4bac2c900a5c6288bfb460a79a2c4d4be2c7..b7092e75790b0fd168f98097c8d91688a996c21e 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-24  John Levon  <levon@movementarian.org>
+
+       * Toolbar_pimpl.C: workaround a Qt bug with combobox
+       popup
+
 2003-05-24  John Levon  <levon@movementarian.org>
 
        * Makefile.am:

diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C
index dba765529e2d678e5964ddfe4c4062a39f876cf8..e8a3473cd419a5ba5202185097b1cbf4f89b6112 100644 (file)
--- a/src/frontends/qt2/Toolbar_pimpl.C
+++ b/src/frontends/qt2/Toolbar_pimpl.C
@@ -86,8 +86,12 @@ void Toolbar::Pimpl::update()
                button->setEnabled(!status.disabled());
        }
 
-       if (combo_)
-               combo_->setEnabled(!owner_->getLyXFunc().getStatus(LFUN_LAYOUT).disabled());
+       bool const enable = !owner_->getLyXFunc().getStatus(LFUN_LAYOUT).disabled();
+
+       // Workaround for Qt bug where setEnabled(true) closes
+       // the popup
+       if (combo_ && enable != combo_->isEnabled())
+               combo_->setEnabled(enable);
 }