Changeset 11109 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Aug 4, 2008 3:42:17 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Fixing geometry saving/restoring issue under X11 for VM Selector dialog.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp (modified) (6 diffs)

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

@@ -590 +590 @@
     retranslateUi();
 
-    /* restore the position of the window */
+    /* Restore the position of the window */
     {
         CVirtualBox vbox = vboxGlobal().virtualBox();
@@ -609 +609 @@
         {
             QRect ar = QApplication::desktop()->availableGeometry (QPoint (x, y));
+
             /* Do some position checks */
             if (x < ar.left() || x > ar.right())
@@ -614 +615 @@
             if (y < ar.top() || y > ar.bottom())
                 y = ar.top();
-            move (x, y);
-            resize (QSize (w, h).expandedTo (minimumSizeHint())
-                .boundedTo (ar.size()));
+
+            /* Composing normal parameters */
+            normal_size = QSize (w, h).expandedTo (minimumSizeHint())
+                          .boundedTo (ar.size());
+            normal_pos = QPoint (x, y);
+
+            /* Applying normal parameters */
+            resize (normal_size);
+            move (normal_pos);
             if (max)
                 /* maximize if needed */
@@ -707 +714 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
 
-    /* save the position of the window */
+    /* Save the position of the window */
     {
         QString winPos = QString ("%1,%2,%3,%4")
-                                 .arg (normal_pos.x()).arg (normal_pos.y())
+                                 .arg (normal_pos.x())
+                                 .arg (normal_pos.y())
                                  .arg (normal_size.width())
                                  .arg (normal_size.height());
@@ -718 +726 @@
         vbox.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);
     }
-    /* save vm selector position */
+
+    /* Save vm selector position */
     {
         VBoxVMItem *item = mVMListView->selectedItem();
@@ -1117 +1126 @@
             if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
                                   Qt::WindowFullScreen)) == 0)
-                normal_pos = pos();
+            {
+                /* On X11 systems window remains un-framed before it
+                 * shown and painted for the first time. In this case
+                 * qt returns similar values for window's position either
+                 * including or excluding window's frame. We no need to
+                 * memorize window's position in this case as this is
+                 * not normal situation, so just ignoring such events.
+                 * Do not trust frameGeometry() in this situation. */
+
+                if (!(pos().x() == geometry().x() && pos().y() == geometry().y()))
+                    normal_pos = pos();
+            }
             break;
         }