Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from parent
authorOndrej Skopek <skopekondrej@gmail.com>
Fri, 14 Dec 2012 18:57:31 +0100
changeset 8298 f9e6da8f94b1
parent 8297 b236e3afed0d (current diff)
parent 8292 c284ea71a4f8 (diff)
child 8299 ef2e284255cd
Merge from parent
QTfrontend/gameuiconfig.cpp file | annotate | diff | comparison | revisions 
--- 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();
hedgewars