Changeset 7483 in vbox

Timestamp:

Mar 18, 2008 9:10:39 AM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: do not suggest a new initial resolution if the saved one is too big for the screen, since we now implement the VideoModeSupported request

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/VBoxConsoleView.cpp (modified) (2 diffs)
• VirtualBox4/src/VBoxConsoleView.cpp (modified) (2 diffs)

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

@@ -3608 +3608 @@
 
 /**
- * We send an initial size hint to the VM on startup, so that it can choose
- * an initial size which is well-readable on the host screen.
+ * We send an initial size hint to the VM on startup, based on the last
+ * resize event in the last session (if any).
  */
 void VBoxConsoleView::sendInitialSizeHint(void)
@@ -3621 +3621 @@
         h = str.section (',', 1, 1).toInt (&ok);
     QRect screen = QApplication::desktop()->screenGeometry (this);
-    if (!ok || w > screen.width() || h > screen.height())
-    {
-        static const int sizeList[][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 < RT_ELEMENTS (sizeList)
-               && 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);
+    if (ok && w <= screen.width() && h <= screen.height())
+    {
+        LogFlowFunc (("Will suggest %d x %d\n", w, h));
+        mConsole.GetDisplay().SetVideoModeHint (w, h, 0, 0);
+    }
 }
 

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

@@ -3602 +3602 @@
  
 /**
- * We send an initial size hint to the VM on startup, so that it can choose
- * an initial size which is well-readable on the host screen.
+ * We send an initial size hint to the VM on startup, based on the last
+ * resize event in the last session (if any).
  */
 void VBoxConsoleView::sendInitialSizeHint(void)
@@ -3615 +3615 @@
         h = str.section (',', 1, 1).toInt (&ok);
     QRect screen = QApplication::desktop()->screenGeometry (this);
-    if (!ok || w > screen.width() || h > screen.height()) 
-    {
-        static const int sizeList[][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 < RT_ELEMENTS (sizeList)
-               && 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);
+    if (ok && w <= screen.width() && h <= screen.height()) 
+    {
+        LogFlowFunc (("Will suggest %d x %d\n", w, h));
+        mConsole.GetDisplay().SetVideoModeHint (w, h, 0, 0);
+    }
 }