Changeset 10148 in vbox

Timestamp:

Jul 3, 2008 9:27:02 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Backported 32672 (FE/Qt4: Do checking of the inital position (Fixes: #2965).)

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (2 diffs)
• VBoxSelectorWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -705 +705 @@
         QString str = cmachine.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
 
-        QRect ar = QApplication::desktop()->availableGeometry (this);
         bool ok = false, max = false;
         int x = 0, y = 0, w = 0, h = 0;
@@ -719 +718 @@
         if (ok)
         {
+            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();
+
             normal_pos = QPoint (x, y);
             normal_size = QSize (w, h);

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

@@ -579 +579 @@
         QString winPos = vbox.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
 
-        QRect ar = QApplication::desktop()->availableGeometry (pos());
         bool ok = false, max = false;
         int x = 0, y = 0, w = 0, h = 0;
@@ -593 +592 @@
         if (ok)
         {
+            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();
             move (x, y);
             resize (QSize (w, h).expandedTo (minimumSizeHint())
@@ -602 +607 @@
         else
         {
+            QRect ar = QApplication::desktop()->availableGeometry (this);
             resize (QSize (770, 550).expandedTo (minimumSizeHint())
                 .boundedTo (ar.size()));