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

Timestamp:

Dec 2, 2008 2:49:19 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40252

Message:

FE/Qt4: 3253: Selector window doesn't save position - fixed. Checked on win, kde, compiz win managers.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -175 +175 @@
     VBoxVMDescriptionPage *mVmDescriptionPage;
 
-    QPoint mNormalPos;
-    QSize mNormalSize;
+    QRect mNormalGeo;
 
     bool mDoneInaccessibleWarningOnce : 1;

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

@@ -591 +591 @@
         if (ok)
             max = winPos.section (',', 4, 4) == VBoxDefs::GUI_LastWindowPosition_Max;
-        if (ok)
+        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));
@@ -601 +601 @@
                 y = ar.top();
 
-            /* Composing normal parameters */
-            mNormalSize = QSize (w, h).expandedTo (minimumSizeHint())
-                          .boundedTo (ar.size());
-            mNormalPos = QPoint (x, y);
-
-            /* Applying normal parameters */
-            resize (mNormalSize);
-            move (mNormalPos);
+            mNormalGeo.moveTo (x, y);
+            mNormalGeo.setSize (QSize (w, h).expandedTo (minimumSizeHint())
+                                            .boundedTo (ar.size()));
+            setGeometry (mNormalGeo);
+
             if (max)
                 /* maximize if needed */
@@ -616 +613 @@
         {
             QRect ar = QApplication::desktop()->availableGeometry (this);
-            resize (QSize (770, 550).expandedTo (minimumSizeHint())
-                .boundedTo (ar.size()));
+            mNormalGeo.setSize (QSize (770, 550).expandedTo (minimumSizeHint())
+                                                .boundedTo (ar.size()));
+            mNormalGeo.moveCenter (ar.center());
+            setGeometry (mNormalGeo);
         }
     }
@@ -698 +697 @@
     {
         QString winPos = QString ("%1,%2,%3,%4")
-                                 .arg (mNormalPos.x())
-                                 .arg (mNormalPos.y())
-                                 .arg (mNormalSize.width())
-                                 .arg (mNormalSize.height());
+            .arg (mNormalGeo.x()).arg (mNormalGeo.y())
+            .arg (mNormalGeo.width()).arg (mNormalGeo.height());
         if (isMaximized())
             winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
@@ -1170 +1167 @@
             if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
                                   Qt::WindowFullScreen)) == 0)
-                mNormalSize = re->size();
+                mNormalGeo.setSize (re->size());
             break;
         }
@@ -1177 +1174 @@
             if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
                                   Qt::WindowFullScreen)) == 0)
-            {
-                /* 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()))
-                    mNormalPos = pos();
-            }
+                mNormalGeo.moveTo (geometry().x(), geometry().y());
             break;
         }