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

Timestamp:

Aug 5, 2008 2:47:00 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Fixed bug of saving/restoring window position of VM Console under KDE/GNOME.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -297 +297 @@
     QMap <QAction *, CHostFloppyDrive> hostFloppyMap;
 
-    QPoint normal_pos;
-    QSize normal_size;
+    QRect mNormalGeometry;
     QSize prev_min_size;
 

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

@@ -708 +708 @@
 #endif
 
-    /* restore the position of the window and some options */
+    /* Restore the position of the window and some options */
     {
         QString str = cmachine.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
@@ -726 +726 @@
         {
             QRect ar = QApplication::desktop()->availableGeometry (QPoint (x, y));
+
             /* Do some position checks */
             if (x < ar.left() || x > ar.right())
@@ -732 +733 @@
                 y = ar.top();
 
-            normal_pos = QPoint (x, y);
-            normal_size = QSize (w, h);
-
-            move (normal_pos);
-            resize (normal_size);
+            mNormalGeometry = QRect (x, y, w, h);
+
+            setGeometry (x, y, w, h);
         }
         else
-        {
-            normal_pos = QPoint();
-            normal_size = QSize();
-        }
-        /* normalize to the optimal size */
+            mNormalGeometry = QRect();
+
+        /* Normalize to the optimal size */
         console->normalizeGeometry (true /* adjustPosition */);
-        /* maximize if needed */
+
+        /* Maximize if needed */
         if (max)
             setWindowState (windowState() | Qt::WindowMaximized);
@@ -1011 +1009 @@
         CMachine machine = csession.GetMachine();
         QString winPos = QString ("%1,%2,%3,%4")
-                                 .arg (normal_pos.x()).arg (normal_pos.y())
-                                 .arg (normal_size.width())
-                                 .arg (normal_size.height());
+            .arg (mNormalGeometry.x()).arg (mNormalGeometry.y())
+            .arg (mNormalGeometry.width()).arg (mNormalGeometry.height());
         if (isMaximized() || (mIsFullscreen && was_max)
                           || (mIsSeamless && was_max))
@@ -1135 +1132 @@
                 !isTrueFullscreen() && !isTrueSeamless())
             {
-                normal_size = re->size();
+                mNormalGeometry.setSize (re->size());
 #ifdef VBOX_WITH_DEBUGGER_GUI
                 dbgAdjustRelativePos();
@@ -1155 +1152 @@
             if (!isMaximized() && !isTrueFullscreen() && !isTrueSeamless())
             {
-                normal_pos = pos();
+                mNormalGeometry.moveTo (geometry().x(), geometry().y());
 #ifdef VBOX_WITH_DEBUGGER_GUI
                 dbgAdjustRelativePos();