Changeset 5996 in vbox for trunk/src

Timestamp:

Dec 7, 2007 12:40:30 PM (17 years ago)

Author:

vboxsync

Message:

2551: VM Console window jumps to a saved location upon VM startup: fixed.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (3 diffs)

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

@@ -655 +655 @@
     CMachine cmachine = csession.GetMachine();
 
-    show();
-
     /* restore the position of the window and some options */
     {
-        QString str = cmachine.GetExtraData (VBoxDefs::GUI_Fullscreen);
-        if (str == "on")
-            vmFullscreenAction->setOn (true);
-
-        vmSeamlessAction->setEnabled (false);
-        str = cmachine.GetExtraData (VBoxDefs::GUI_Seamless);
-        if (str == "on")
-            vmSeamlessAction->setOn (true);
-
-        str = cmachine.GetExtraData (VBoxDefs::GUI_AutoresizeGuest);
-        if (str != "off")
-            vmAutoresizeGuestAction->setOn (true);
-
-        str = cmachine.GetExtraData (VBoxDefs::GUI_FirstRun);
-        if (str == "yes")
-            mIsFirstTimeStarted = true;
-        else if (!str.isEmpty())
-            cmachine.SetExtraData (VBoxDefs::GUI_FirstRun, QString::null);
-
-        str = cmachine.GetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime);
-        if (str == "no")
-            mIsAutoSaveMedia = false;
-
-        str = cmachine.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
+        QString str = cmachine.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
 
         QRect ar = QApplication::desktop()->availableGeometry (this);
@@ -700 +675 @@
             normal_pos = QPoint (x, y);
             normal_size = QSize (w, h);
-            if (!mIsFullscreen && !vmSeamlessAction->isOn())
-            {
-                move (normal_pos);
-                resize (normal_size);
-                /* normalize to the optimal size */
-                console->normalizeGeometry (true /* adjustPosition */);
-                /* maximize if needed */
-                if (max)
-                    setWindowState (windowState() | WindowMaximized);
-            }
-            else
-                was_max = max;
+
+            move (normal_pos);
+            resize (normal_size);
         }
         else
@@ -717 +683 @@
             normal_pos = QPoint();
             normal_size = QSize();
-            if (!mIsFullscreen && !vmSeamlessAction->isOn())
-            {
-                console->normalizeGeometry (true /* adjustPosition */);
-                /* maximize if needed */
-                if (max)
-                    setWindowState (windowState() | WindowMaximized);
-            }
-            else
-                was_max = max;
-        }
+        }
+        /* normalize to the optimal size */
+        console->normalizeGeometry (true /* adjustPosition */);
+        /* maximize if needed */
+        if (max)
+            setWindowState (windowState() | WindowMaximized);
+        was_max = max;
+
+        show();
+
+        str = cmachine.GetExtraData (VBoxDefs::GUI_Fullscreen);
+        if (str == "on")
+            vmFullscreenAction->setOn (true);
+
+        vmSeamlessAction->setEnabled (false);
+        str = cmachine.GetExtraData (VBoxDefs::GUI_Seamless);
+        if (str == "on")
+            vmSeamlessAction->setOn (true);
+
+        str = cmachine.GetExtraData (VBoxDefs::GUI_AutoresizeGuest);
+        if (str != "off")
+            vmAutoresizeGuestAction->setOn (true);
+
+        str = cmachine.GetExtraData (VBoxDefs::GUI_FirstRun);
+        if (str == "yes")
+            mIsFirstTimeStarted = true;
+        else if (!str.isEmpty())
+            cmachine.SetExtraData (VBoxDefs::GUI_FirstRun, QString::null);
+
+        str = cmachine.GetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime);
+        if (str == "no")
+            mIsAutoSaveMedia = false;
     }