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

Timestamp:

Jul 31, 2014 12:09:47 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: More appropriate procedure of saving/restoring guest size-hints for normal/scale <=> fullscreen/seamless transitions.

Location:

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

Files:

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

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

@@ -181 +181 @@
 
     /* Send new size-hint to the guest: */
-    LogRelFlow(("UIMachineView: Sending guest size-hint to screen %d: %dx%d\n",
-                (int)screenId(), newSize.width(), newSize.height()));
+    LogRel(("UIMachineView::sltPerformGuestResize: "
+            "Sending guest size-hint to screen %d as %dx%d\n",
+            (int)screenId(), newSize.width(), newSize.height()));
     session().GetConsole().GetDisplay().SetVideoModeHint(screenId(),
                                                          uisession()->isScreenVisible(screenId()),
@@ -654 +655 @@
 {
     /* Save guest-screen size-hint: */
+    LogRel(("UIMachineView::storeGuestSizeHint: "
+            "Storing guest size-hint for screen %d as %dx%d\n",
+            (int)screenId(), size.width(), size.height()));
     gEDataManager->setLastGuestSizeHint(m_uScreenId, size, vboxGlobal().managedVMUuid());
 }

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

@@ -50 +50 @@
     , m_bIsGuestAutoresizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
 {
-    /* Resend the last resize hint if there was a fullscreen or
-     * seamless transition previously. If we were not in graphical
-     * mode initially after the transition this happens when we switch. */
-    maybeResendResizeHint();
+    /* Resend the last resize hint if necessary: */
+    maybeResendSizeHint();
 }
 
@@ -146 +144 @@
 void UIMachineViewNormal::saveMachineViewSettings()
 {
-    /* Store guest size in case we are switching to fullscreen: */
-    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
+    /* If guest screen-still visible => store it's size-hint: */
+    if (uisession()->isScreenVisible(screenId()))
+        storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
 }
 
@@ -161 +160 @@
 }
 
-/**
- * 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()
+void UIMachineViewNormal::maybeResendSizeHint()
 {
     if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
@@ -175 +167 @@
         if (gEDataManager->wasLastGuestSizeHintForFullScreen(m_uScreenId, vboxGlobal().managedVMUuid()))
         {
-            QSize hint = guestSizeHint();
+            const QSize sizeHint = guestSizeHint();
+            LogRel(("UIMachineViewNormal::maybeResendSizeHint: "
+                    "Restoring guest size-hint for screen %d to %dx%d\n",
+                    (int)screenId(), sizeHint.width(), sizeHint.height()));
             /* Temporarily restrict the size to prevent a brief resize to the
              * framebuffer dimensions (see @a UIMachineView::sizeHint()) before
              * the following resize() is acted upon. */
-            setMaximumSize(hint);
-            m_sizeHintOverride = hint;
-            sltPerformGuestResize(hint);
+            setMaximumSize(sizeHint);
+            m_sizeHintOverride = sizeHint;
+            sltPerformGuestResize(sizeHint);
         }
     }

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

@@ -64 +64 @@
     void setGuestAutoresizeEnabled(bool bEnabled);
 
+    /** Resends guest size-hint if necessary. */
+    void maybeResendSizeHint();
+
     /* Private helpers: */
-    void maybeResendResizeHint();
     void maybeAdjustGuestScreenSize();
     QRect workingArea() const;

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

@@ -29 +29 @@
 #include "UIMachineWindow.h"
 #include "UIMachineViewScale.h"
+#include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
 
@@ -49 +50 @@
     , m_pPauseImage(0)
 {
+    /* Resend the last resize hint if necessary: */
+    maybeResendSizeHint();
 }
 
@@ -174 +177 @@
 void UIMachineViewScale::saveMachineViewSettings()
 {
-    /* Store guest size in case we are switching to fullscreen: */
-    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
+    /* If guest screen-still visible => store it's size-hint: */
+    if (uisession()->isScreenVisible(screenId()))
+        storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
+}
+
+void UIMachineViewScale::maybeResendSizeHint()
+{
+    if (uisession()->isGuestSupportsGraphics())
+    {
+        /* Send guest-screen size-hint if needed to reverse a transition to fullscreen or seamless: */
+        if (gEDataManager->wasLastGuestSizeHintForFullScreen(m_uScreenId, vboxGlobal().managedVMUuid()))
+        {
+            const QSize sizeHint = guestSizeHint();
+            LogRel(("UIMachineViewScale::maybeResendSizeHint: "
+                    "Restoring guest size-hint for screen %d to %dx%d\n",
+                    (int)screenId(), sizeHint.width(), sizeHint.height()));
+            sltPerformGuestResize(sizeHint);
+        }
+    }
 }
 

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

@@ -63 +63 @@
     void saveMachineViewSettings();
 
+    /** Resends guest size-hint if necessary. */
+    void maybeResendSizeHint();
+
     /* Private helpers: */
     QSize sizeHint() const;