Revert from revision 15769:

* src/frontends/qt4/panelstack.C:
	- fix the preferences and document dialog resizing problem (well, at least
	  for me -- please verify).

This didn't fix the problem. I'm pretty sure now that this is a bug in Qt 4.2(.1?)

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

diff --git a/Status.15x b/Status.15x
index 735e134a386c003cbe93bd33b3a656200b54116c..93a42bdd1aa89d83a9ea9c7a0a7d9750f68164a7 100644 (file)
--- a/Status.15x
+++ b/Status.15x
@@ -44,6 +44,11 @@ TABLE OF CONTENTS
 
 DIALOGS
 
+* If you open Document>Settings... or Tools>Preferences... for the first time,
+  the dialog is much too small to show its content; if you invoke it the second
+  time, everything is fine. This happens with qt 4.2.1, it does not seem to
+  happen with 4.1.4.
+
 * If you open Edit>Test 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
@@ -188,8 +193,6 @@ MAC OS X
   keyboard command, not from the menu -- appears initially too small and must be
   resized; not possible to select buttons with the keyboard).
 
-  The preferences dialog issue should be fixed now. See below (JSpitzm 2006-11-06).
-
 * Some oddities with View menu on MAC (Bennett 3/11/06): DVI does not appear
   in the menu, even though a converter and viewer are defined in Preferences.
 
@@ -279,12 +282,4 @@ CREDITS:
 
   FIXED (MGerz 2006-11-05)
 
-* If you open Document>Settings... or Tools>Preferences... for the first time,
-  the dialog is much too small to show its content; if you invoke it the second
-  time, everything is fine. This happens with qt 4.2.1, it does not seem to
-  happen with 4.1.4. (Postscriptum JSpitzm: I think it was not the qt version.
-  but the qt font settings that triggered this bug).
-
-  FIXED (JSpitzm 2006-11-06)
-
 

diff --git a/src/frontends/qt4/panelstack.C b/src/frontends/qt4/panelstack.C
index 35cb42c37cee312d61803cccef0b8d27201ad987..fe9d8d0d20759bec5138e4b9a988a005358874a1 100644 (file)
--- a/src/frontends/qt4/panelstack.C
+++ b/src/frontends/qt4/panelstack.C
@@ -104,11 +104,7 @@ void PanelStack::addPanel(QWidget * panel, docstring const & name, docstring con
 
        widget_map_[item] = panel;
        stack_->addWidget(panel);
-       // adjust the stack size to the largest panel
-       if (panel->minimumWidth() > stack_->minimumWidth())
-               stack_->setMinimumWidth(panel->minimumWidth());
-       if (panel->minimumHeight() > stack_->minimumHeight())
-               stack_->setMinimumHeight(panel->minimumHeight());
+       stack_->setMinimumSize(panel->minimumSize());
 }