From: John Levon <levon@movementarian.org>
Date: Sat, 24 May 2003 15:53:55 +0000 (+0000)
Subject: work around a Qt bug in 3.1.2, fixing bug 1136
X-Git-Tag: 1.6.10~16749
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a33f68e37fa28eb1dd0052643c8e15a67a0e2e38;p=features.git

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 3dbb4bac2c..b7092e7579 100644
--- 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 dba765529e..e8a3473cd4 100644
--- 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);
 }