# HG changeset patch
# User Ondrej Skopek <skopekondrej@gmail.com>
# Date 1355507851 -3600
# Node ID f9e6da8f94b17a7cdde0b504375d2414ceaf331f
# Parent  b236e3afed0d74d58e898cb9fc787d9c8a0dd1fd# Parent  c284ea71a4f8fd985a99de53d2766725e775590e
Merge from parent

diff -r b236e3afed0d -r f9e6da8f94b1 QTfrontend/gameuiconfig.cpp
--- a/QTfrontend/gameuiconfig.cpp	Fri Dec 14 18:49:25 2012 +0100
+++ b/QTfrontend/gameuiconfig.cpp	Fri Dec 14 18:57:31 2012 +0100
@@ -191,8 +191,8 @@
 {
     // fill 2/3 of the screen desktop
     const QRect deskSize = QApplication::desktop()->screenGeometry(-1);
-    Form->resize(value("frontend/width", deskSize.width()*2/3).toUInt(),
-                 value("frontend/height", deskSize.height()*2/3).toUInt());
+    Form->resize(value("frontend/width", qMin(qMax(deskSize.width()*2/3,800),deskSize.width())).toUInt(),
+                 value("frontend/height", qMin(qMax(deskSize.height()*2/3,600),deskSize.height())).toUInt());
 
     // move the window to the center of the screen
     QPoint center = QApplication::desktop()->availableGeometry(-1).center();