Changeset 7335 in vbox

Timestamp:

Mar 6, 2008 5:16:24 PM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: remember the last video mode hint sent in the machine XML file and resend it on VM boot

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (3 diffs)
• src/VBoxDefs.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -285 +285 @@
     CGImageRef mVirtualBoxLogo;
 #endif
+    QSize mLastSizeHint;
 };
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -168 +168 @@
     static const char* GUI_LastVMSelected;
     static const char* GUI_InfoDlgState;
+    static const char* GUI_LastSizeHint;
 };
 

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

@@ -2868 +2868 @@
             break;
         }
+        case KMachineState_Stopping:
+        {
+            if (mLastSizeHint.isValid())
+            {
+                CMachine cmachine = mConsole.GetMachine();
+                QString str = QString ("%1,%2")
+                                      .arg (mLastSizeHint.width())
+                                      .arg (mLastSizeHint.height());
+                cmachine.SetExtraData (VBoxDefs::GUI_LastSizeHint, str);
+            }
+        }
         default:
             break;
@@ -3567 +3578 @@
 
         mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
+        mLastSizeHint = sz;
     }
 }
@@ -3577 +3589 @@
 void VBoxConsoleView::sendInitialSizeHint(void)
 {
-    enum { NUM_RES = 4 };
-
-    const int sizeList[NUM_RES][2] =
-    {
-        { 640, 480 },
-        { 800, 600 },
-        { 1024, 768 },
-        { 1280, 960 }
-    };
-    /** @todo save the last resize hint sent before a VM shutdown in
-        the XML and send that on next startup. */
+    CMachine cmachine = mConsole.GetMachine();
+    QString str = cmachine.GetExtraData (VBoxDefs::GUI_LastSizeHint);
+    int w = 0, h = 0;
+    bool ok = true;
+    w = str.section (',', 0, 0).toInt (&ok);
+    if (ok)
+        h = str.section (',', 1, 1).toInt (&ok);
     QRect screen = QApplication::desktop()->screenGeometry (this);
-    unsigned i = 0;
-    /* Find a size that is smaller than three quarters of the reported
-       screen geometry. */
-    while (   (i + 1 < NUM_RES)
-           && (sizeList[i + 1][0] < screen.width() * 3 / 4)
-           && (sizeList[i + 1][1] < screen.height() * 3 / 4))
-        ++i;
-    LogFlowFunc (("Will suggest %d x %d\n", sizeList[i][0], sizeList[i][1]));
-    mConsole.GetDisplay().SetVideoModeHint (sizeList[i][0], sizeList[i][1], 0, 0);
+    if (!ok || w > screen.width() || h > screen.height())
+    {
+        enum { NUM_RES = 4 };
+        const int sizeList[NUM_RES][2] =
+        {
+            { 640, 480 },
+            { 800, 600 },
+            { 1024, 768 },
+            { 1280, 960 }
+        };
+        unsigned i = 0;
+
+        /* Find a size that is smaller than three quarters of the reported
+           screen geometry. */
+        while (   (i + 1 < NUM_RES)
+               && (sizeList[i + 1][0] < screen.width() * 3 / 4)
+               && (sizeList[i + 1][1] < screen.height() * 3 / 4))
+            ++i;
+        w = sizeList[i][0];
+        h = sizeList[i][1];
+    }
+    LogFlowFunc (("Will suggest %d x %d\n", w, h));
+    mConsole.GetDisplay().SetVideoModeHint (w, h, 0, 0);
 }
 

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

@@ -36 +36 @@
 const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
+const char* VBoxDefs::GUI_LastSizeHint = "GUI/LastSizeHint";