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

Timestamp:

Oct 9, 2013 3:06:13 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Unify geometry normalization stuff for fullscreen and seamless modes.

Location:

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

Files:

• fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.h (modified) (3 diffs)
• seamless/UIMachineViewSeamless.cpp (modified) (3 diffs)
• seamless/UIMachineViewSeamless.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -63 +63 @@
 void UIMachineViewFullscreen::sltAdditionsStateChanged()
 {
-    /* Check if we should resize guest to fullscreen */
-    if ((int)frameBuffer()->width() != workingArea().size().width() ||
-        (int)frameBuffer()->height() != workingArea().size().height())
-        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
-            sltPerformGuestResize(workingArea().size());
+    normalizeGeometry(false);
 }
 
@@ -142 +138 @@
 void UIMachineViewFullscreen::normalizeGeometry(bool /* fAdjustPosition */)
 {
-    sltPerformGuestResize(workingArea().size());
+    /* Check if we should adjust guest to new size: */
+    if ((int)frameBuffer()->width() != workingArea().size().width() ||
+        (int)frameBuffer()->height() != workingArea().size().height())
+        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+            sltPerformGuestResize(workingArea().size());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h

@@ -41 +41 @@
 private slots:
 
-    /* Console callback handlers: */
+    /* Handler: Console callback stuff: */
     void sltAdditionsStateChanged();
 
@@ -56 +56 @@
     /* Cleanup routines: */
     //void cleanupConsoleConnections() {}
-    //void cleanupConnections() {}
     //void cleanupFilters() {}
     //void cleanupCommon() {}
@@ -64 +63 @@
 
     /* Private helpers: */
-    void normalizeGeometry(bool /* fAdjustPosition */);
+    void normalizeGeometry(bool fAdjustPosition);
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -70 +70 @@
 }
 
+void UIMachineViewSeamless::sltAdditionsStateChanged()
+{
+    normalizeGeometry(false);
+}
+
 void UIMachineViewSeamless::sltHandleSetVisibleRegion(QRegion region)
 {
@@ -126 +131 @@
 }
 
+void UIMachineViewSeamless::prepareConsoleConnections()
+{
+    /* Base class connections: */
+    UIMachineView::prepareConsoleConnections();
+
+    /* Guest additions state-change updater: */
+    connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltAdditionsStateChanged()));
+}
+
 void UIMachineViewSeamless::prepareSeamless()
 {
@@ -138 +152 @@
         /* Reset seamless feature flag of the guest: */
         session().GetConsole().GetDisplay().SetSeamlessMode(false);
+}
+
+void UIMachineViewSeamless::normalizeGeometry(bool /* fAdjustPosition */)
+{
+    /* Check if we should adjust guest to new size: */
+    if ((int)frameBuffer()->width() != workingArea().size().width() ||
+        (int)frameBuffer()->height() != workingArea().size().height())
+        if (uisession()->isGuestSupportsGraphics())
+            sltPerformGuestResize(workingArea().size());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -41 +41 @@
 private slots:
 
+    /* Handler: Console callback stuff: */
+    void sltAdditionsStateChanged();
+
     /* Handler: Frame-buffer SetVisibleRegion stuff: */
     virtual void sltHandleSetVisibleRegion(QRegion region);
@@ -52 +55 @@
     void prepareCommon();
     void prepareFilters();
+    void prepareConsoleConnections();
     void prepareSeamless();
 
     /* Cleanup helpers: */
     void cleanupSeamless();
+    //void cleanupConsoleConnections() {}
     //void cleanupFilters() {}
     //void cleanupCommon() {}
 
     /* Private helpers: */
-    void normalizeGeometry(bool /* fAdjustPosition */) {}
+    void normalizeGeometry(bool fAdjustPosition);
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;