Changeset 48644 in vbox for trunk

Timestamp:

Sep 23, 2013 5:54:48 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89238

Message:

FE/Qt: limit the maximum recommended guest screen size before the window is visible, make the code and comments more future-proof.

Location:

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

Files:

• normal/UIMachineViewNormal.cpp (modified) (2 diffs)
• scale/UIMachineViewScale.cpp (modified) (2 diffs)

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

@@ -248 +248 @@
 QSize UIMachineViewNormal::calculateMaxGuestSize() const
 {
+    /* 1) 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.
+     * 2) We also get called early before "machineWindow" has been fully
+     *    initialised, at which time we can't perform the calculation. */
+    if (!isVisible())
+        return workingArea().size() * 0.95;
     /* The area taken up by the machine window on the desktop, including window
      * frame, title, menu bar and status bar. */
@@ -257 +264 @@
     /* 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
 {
+    /* 1) 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.
+     * 2) We also get called early before "machineWindow" has been fully
+     *    initialised, at which time we can't perform the calculation. */
+    if (!isVisible())
+        return workingArea().size() * 0.95;
     /* The area taken up by the machine window on the desktop, including window
      * frame, title, menu bar and status bar. */
@@ -205 +212 @@
     /* 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