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

Timestamp:

Sep 23, 2013 4:23:31 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: limit the maximum recommended guest screen size before the window is visible.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• scale/UIMachineViewScale.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -172 +172 @@
      * but not for Fullscreen and Scale.  However for Scale it is a no op.,
      * so it would not hurt.  Would it hurt for Fullscreen? */
+
+    /* Set a preliminary maximum size: */
+    pMachineView->setMaxGuestSize();
 
     return pMachineView;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -257 +257 @@
     /* The current size of the machine display. */
     QSize centralWidgetSize = machineWindow()->centralWidget()->size();
+    /* The calculation below is not reliable on some (X11) platforms until we
+     * have been visible for a fraction of a second, so so the best we can
+     * otherwise. */
+    if (!isVisible())
+        return workingArea().size() * 0.95;
     /* To work out how big the guest display can get without the window going
      * over the maximum size we calculated above, we work out how much space

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -196 +196 @@
 QSize UIMachineViewScale::calculateMaxGuestSize() const
 {
-    /* The area taken up by the machine window on the desktop,
-     * including window frame, title, menu bar and status bar: */
-    QRect windowGeo = machineWindow()->frameGeometry();
-    /* The area taken up by the machine central widget, so excluding all decorations: */
-    QRect centralWidgetGeo = machineWindow()->centralWidget()->geometry();
-    /* To work out how big we can make the console window while still fitting on the desktop,
-     * we calculate workingArea() - (windowGeo - centralWidgetGeo).
-     * This works because the difference between machine window and machine central widget
-     * (or at least its width and height) is a constant. */
-    return QSize(  workingArea().width()
-                 - (windowGeo.width() - centralWidgetGeo.width()),
-                   workingArea().height()
-                 - (windowGeo.height() - centralWidgetGeo.height()));
+    /* The area taken up by the machine window on the desktop, including window
+     * frame, title, menu bar and status bar. */
+    QSize windowSize = machineWindow()->frameGeometry().size();
+    /* The window shouldn't be allowed to expand beyond the working area
+     * unless it already does.  In that case the guest shouldn't expand it
+     * any further though. */
+    QSize maximumSize = workingArea().size().expandedTo(windowSize);
+    /* The current size of the machine display. */
+    QSize centralWidgetSize = machineWindow()->centralWidget()->size();
+    /* The calculation below is not reliable on some (X11) platforms until we
+     * have been visible for a fraction of a second, so so the best we can
+     * otherwise. */
+    if (!isVisible())
+        return workingArea().size() * 0.95;
+    /* To work out how big the guest display can get without the window going
+     * over the maximum size we calculated above, we work out how much space
+     * the other parts of the window (frame, menu bar, status bar and so on)
+     * take up and subtract that space from the maximum window size. The 
+     * central widget shouldn't be bigger than the window, but we bound it for
+     * sanity (or insanity) reasons. */
+    return maximumSize - (windowSize - centralWidgetSize.boundedTo(windowSize));
 }