From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Mon, 6 Nov 2006 16:27:31 +0000 (+0000)
Subject: * src/frontends/qt4/panelstack.C:
X-Git-Tag: 1.6.10~12014
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=54cc44fd9a330977fe8d71808b7949f1007f31f5;p=features.git

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

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

diff --git a/Status.15x b/Status.15x
index 220df5071d..735e134a38 100644
--- a/Status.15x
+++ b/Status.15x
@@ -44,11 +44,6 @@ 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
@@ -81,6 +76,10 @@ OTHER PANELS
   There is a big listbox just to select one of the four levels.
   Isn't this supposed to be a drop-down list or something like that?
 
+* The bullet selection widget shows the bullets in 5 columns (instead of 6)
+  for me, and hence does not fit into the window.
+  (JSpitzm 2006-11-06)
+
 
 MULTIPLE WINDOWS / DOCUMENTS
 
@@ -189,6 +188,8 @@ 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.
 
@@ -278,4 +279,12 @@ 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 fe9d8d0d20..35cb42c37c 100644
--- a/src/frontends/qt4/panelstack.C
+++ b/src/frontends/qt4/panelstack.C
@@ -104,7 +104,11 @@ void PanelStack::addPanel(QWidget * panel, docstring const & name, docstring con
 
 	widget_map_[item] = panel;
 	stack_->addWidget(panel);
-	stack_->setMinimumSize(panel->minimumSize());
+	// 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());
 }