Re: r30897 - lyx-devel/trunk/src/frontends/qt4

[Vincent van Ravesteijn]

v...@lyx.org schreef:

Author: vfr
Date: Fri Aug  7 14:49:03 2009
New Revision: 30897
URL: http://www.lyx.org/trac/changeset/30897

Log:
Work-around for bug #6034: Applying preferences confuses window about its size.

Modified:
   lyx-devel/trunk/src/frontends/qt4/GuiView.cpp

Modified: lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiView.cpp       Fri Aug  7 14:19:59 
2009        (r30896)
+++ lyx-devel/trunk/src/frontends/qt4/GuiView.cpp       Fri Aug  7 14:49:03 
2009        (r30897)
@@ -387,8 +387,12 @@
        resize(size);
        move(pos);
 #else
-       if (!restoreGeometry(settings.value("geometry").toByteArray()))
-               setGeometry(50, 50, 690, 510);
+       // Work-around for bug #6034: the window ends up in an undetermined
+       // state when trying to restore a maximized window when it is
+       // already maximized.
+       if (!(windowState() & Qt::WindowMaximized))
+               if (!restoreGeometry(settings.value("geometry").toByteArray()))
+                       setGeometry(50, 50, 690, 510);
 #endif
        // Make sure layout is correctly oriented.
        setLayoutDirection(qApp->layoutDirection());

To branch ?

Vincent