* src/frontends/qt4/QCharacter.C:

	- fix dialog resizing for QT >= 4.2 (bug 3032).

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

diff --git a/Status.15x b/Status.15x
index b2ffe20eb3baa8cc8d42ec7f354a970370c12ab0..c76a957ba38186f06bfee4238eab809429e5b1c3 100644 (file)
--- a/Status.15x
+++ b/Status.15x
@@ -405,13 +405,13 @@ CREDITS:
   FIXED (JSpitzm-2006-11-06): force updateGeometry() after the panelstack has 
   been created (with Qt >= 4.2 only). A brute method, but it works.
 
-* If you open Edit>Test Style... for the first time, the choice text for
+* If you open Edit>Text Style... for the first time, the choice text for
   "Never Toggled>Size" doesn't fit in the selection box (note that in German,
   texts are a bit longer than in English). Interestingly, if you invoke the
   dialog a second time, its button sizes are adjusted to their content.
-
-  WONTFIX: This happens with qt >= 4.2 only, it does not happen with 4.1.4/4.1.5!
-  (or maybe try to add an updateGeometry() call somewhere as well; JSpitzm).
+  This happens with qt >= 4.2 only, it does not happen with 4.1.4/4.1.5!
+  
+  FIXED (2006-12-24 JSpitzm)
 
 * All label and button texts in the Qt4 dialogs are not translated.
 

diff --git a/src/frontends/qt4/QCharacter.C b/src/frontends/qt4/QCharacter.C
index 70ff96fe837fbdc02eb9a6709dbd1bef3108b34d..f96e4a10ea2577807f46fba3604b5c7096c32e8f 100644 (file)
--- a/src/frontends/qt4/QCharacter.C
+++ b/src/frontends/qt4/QCharacter.C
@@ -90,6 +90,12 @@ void QCharacter::build_dialog()
        bcview().addReadOnly(dialog_->colorCO);
        bcview().addReadOnly(dialog_->toggleallCB);
        bcview().addReadOnly(dialog_->autoapplyCB);
+
+// FIXME: hack to work around resizing bug in Qt >= 4.2
+#if QT_VERSION >= 0x040200
+       // qt resizes the comboboxes only after show(), so ...
+       dialog_->show();
+#endif
 }