Changeset 15910 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 13, 2009 11:15:41 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 2965: Main window and VM window should not appear outside the desktop: Main VM Selector window is now behaves according proposed rules.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -591 +591 @@
         if (ok)
             max = winPos.section (',', 4, 4) == VBoxDefs::GUI_LastWindowPosition_Max;
-        if (ok && x > 0 && y > 0 /* to be sure it is not loaded out of the screen */)
-        {
-            QRect ar = QApplication::desktop()->availableGeometry (QPoint (x, y));
-
-            /* Do some position checks */
-            if (x < ar.left() || x > ar.right())
-                x = ar.left();
-            if (y < ar.top() || y > ar.bottom())
-                y = ar.top();
-
+
+        QRect ar = ok ? QApplication::desktop()->availableGeometry (QPoint (x, y)) :
+                        QApplication::desktop()->availableGeometry (this);
+
+        if (ok /* previous parameters were read correctly */
+            && (y > 0) && (y < ar.bottom()) /* check vertical bounds */
+            && (x + w > ar.left()) && (x < ar.right()) /* & horizontal bounds */)
+        {
             mNormalGeo.moveTo (x, y);
             mNormalGeo.setSize (QSize (w, h).expandedTo (minimumSizeHint())
                                             .boundedTo (ar.size()));
             setGeometry (mNormalGeo);
-
-            if (max)
-                /* maximize if needed */
+            if (max) /* maximize if needed */
                 showMaximized();
         }
         else
         {
-            QRect ar = QApplication::desktop()->availableGeometry (this);
             mNormalGeo.setSize (QSize (770, 550).expandedTo (minimumSizeHint())
                                                 .boundedTo (ar.size()));