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

Timestamp:

Mar 14, 2008 9:53:08 AM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox4: ported r28888: the saved guest resolution and initial size hint should take guest-initiated resolution changes into account as long as the additions are managing graphics in the guest

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp (modified) (4 diffs)

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

@@ -1087 +1087 @@
                 if (mMainWnd->isTrueFullscreen() || mMainWnd->isTrueSeamless())
                     updateGeometry();
+
+                /* Remember the new size for sending an initial size hint
+                   on next power up. */
+                if (mConsole.GetGuest().GetSupportsGraphics())
+                    mLastSizeHint = QSize(re->width(), re->height());
 
                 /* make sure that all posted signals are processed */
@@ -3579 +3584 @@
 
         mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
-        mLastSizeHint = sz;
     }
 }
@@ -3600 +3604 @@
     if (!ok || w > screen.width() || h > screen.height()) 
     {
-        enum { NUM_RES = 4 };
-        const int sizeList[NUM_RES][2] =
+        static const int sizeList[][2] =
         {
             { 640, 480 },
@@ -3612 +3615 @@
         /* 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))
+        while (   i + 1 < RT_ELEMENTS (sizeList)
+               && sizeList[i + 1][0] < screen.width() * 3 / 4
+               && sizeList[i + 1][1] < screen.height() * 3 / 4)
             ++i;
         w = sizeList[i][0];