Changeset 49176 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 18, 2013 10:23:05 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Some small cleanup.

Location:

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

Files:

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

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

@@ -146 +146 @@
 }
 
+void UIMachineViewNormal::saveMachineViewSettings()
+{
+    /* Store guest size in case we are switching to fullscreen: */
+    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
+}
+
+void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
+{
+    if (m_bIsGuestAutoresizeEnabled != fEnabled)
+    {
+        m_bIsGuestAutoresizeEnabled = fEnabled;
+
+        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+            sltPerformGuestResize();
+    }
+}
+
+/**
+ * Resends guest size-hint if necessary.
+ * If the last guest size hint was sent to switch to
+ * fullscreen or seamless mode then send one to restore the old view size.
+ * @note This method also does some hacks to suppress intermediary resizes
+ *       to the old fullscreen size.
+ */
 void UIMachineViewNormal::maybeResendResizeHint()
 {
@@ -167 +191 @@
             sltPerformGuestResize(hint);
         }
-    }
-}
-
-void UIMachineViewNormal::saveMachineViewSettings()
-{
-    /* Store guest size in case we are switching to fullscreen: */
-    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
-}
-
-void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
-{
-    if (m_bIsGuestAutoresizeEnabled != fEnabled)
-    {
-        m_bIsGuestAutoresizeEnabled = fEnabled;
-
-        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
-            sltPerformGuestResize();
     }
 }

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

@@ -60 +60 @@
     void prepareConsoleConnections();
     //void loadMachineViewSettings();
-    /** If the last guest size hint was sent to switch to fullscreen or
-     * seamless mode then send one to restore the old view size.
-     * @note This method also does some hacks to suppress intermediary resizes
-     *        to the old fullscreen size. */
-    void maybeResendResizeHint();
 
     /* Cleanup helpers: */
@@ -76 +71 @@
 
     /* Private helpers: */
+    void maybeResendResizeHint();
     void normalizeGeometry(bool fAdjustPosition);
     QRect workingArea() const;

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

@@ -58 +58 @@
 
     /* Prepare helpers: */
-    // void prepareFrameBuffer();
-    //void loadMachineViewSettings();
+    //void loadMachineViewSettings() {}
 
     /* Cleanup helpers: */
     void saveMachineViewSettings();
-    //void cleanupConnections() {}
-    //void cleanupFrameBuffer() {}
 
     /* Private helpers: */