Changeset 39023 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

Timestamp:

Oct 18, 2011 9:01:00 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: cleaned up the maximum guest size code

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (modified) (3 diffs)

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

@@ -154 +154 @@
 void UIMachineViewScale::sltDesktopResized()
 {
-    /* Recalculate the maximum guest size if necessary. */
-    calculateMaxGuestSize();
+
 }
 
@@ -185 +184 @@
             /* Report to the VM thread that we finished resizing: */
             session().GetConsole().GetDisplay().ResizeCompleted(screenId());
-
-            /* We also recalculate the maximum guest size if necessary.  In
-             * fact we only need this on the first resize, but it is done
-             * every time to keep the code simpler. */
-            calculateMaxGuestSize();
 
             /* Emit a signal about guest was resized: */
@@ -368 +362 @@
 }
 
-void UIMachineViewScale::calculateMaxGuestSize()
-{
-    /* This method should not get called until we have initially set up the
-     * maximum guest size policy. */
-    Assert((maxGuestSizePolicy() != MaxGuestSizePolicy_Invalid));
-    /* If we are not doing automatic adjustment then there is nothing to do. */
-    if (maxGuestSizePolicy() == MaxGuestSizePolicy_Automatic)
-    {
-        /* The area taken up by the machine window on the desktop,
-         * including window frame, title, menu bar and status bar: */
-        QRect windowGeo = machineWindowWrapper()->machineWindow()->frameGeometry();
-        /* The area taken up by the machine central widget, so excluding all decorations: */
-        QRect centralWidgetGeo = static_cast<QMainWindow*>(machineWindowWrapper()->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. */
-        m_fixedMaxGuestSize = QSize(  workingArea().width()
-                                    - (windowGeo.width()
-                                    - centralWidgetGeo.width()),
-                                      workingArea().height()
-                                    - (windowGeo.height()
-                                    - centralWidgetGeo.height()));
-    }
+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 = machineWindowWrapper()->machineWindow()->frameGeometry();
+    /* The area taken up by the machine central widget, so excluding all decorations: */
+    QRect centralWidgetGeo = static_cast<QMainWindow*>(machineWindowWrapper()->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()));
 }