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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30899 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiView.cpp

@@ -383,8 +383,12 @@ bool GuiView::restoreLayout()
 	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());

status.16x

@@ -212,6 +212,9 @@ What's new
 - Fix assertion in mathed when moving the cursor immediately after
   pressing Ctrl-L (or '\' with inline completion disabled) in front of
   another character (bug 6063).
+  
+- Prevent a window resize when applying the Preferences when the 
+  LyX window is maximized (bug 6034).
 
 - Make Tools>Statistics ignore Note insets and inactive branches
   (bug 2566).