Changeset 57495 in vbox

Timestamp:

Aug 21, 2015 12:50:43 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: better fix for temporary over-sized windows when exiting full-screen and seamless.

Location:

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

Files:

• UIMachineView.cpp (modified) (4 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -280 +280 @@
             /* Assign new frame-buffer logical-size: */
             frameBuffer()->setScaledSize(size());
+
+            /* Forget the last full-screen size: */
+            uisession()->setLastFullScreenSize(screenId(), QSize(-1, -1));
         }
         /* For other than 'scale' mode: */
@@ -287 +290 @@
             setMaximumSize(sizeHint());
 
-            /* Disable the resize hint override hack: */
+            /* Disable the resize hint override hack and forget the last full-screen size: */
             m_sizeHintOverride = QSize(-1, -1);
+            if (visualStateType() == UIVisualStateType_Normal)
+                uisession()->setLastFullScreenSize(screenId(), QSize(-1, -1));
 
             /* Force machine-window update own layout: */
@@ -843 +848 @@
 QSize UIMachineView::sizeHint() const
 {
-    if (m_sizeHintOverride.isValid() && uisession()->isGuestSupportsGraphics())
+    /* Temporarily restrict the size to prevent a brief resize to the
+     * frame-buffer dimensions when we exit full-screen.  This is only
+     * applied if the frame-buffer is at full-screen dimensions and
+     * until the first machine view resize. */
+
+    /* Get the frame-buffer dimensions: */
+    QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
+    /* Take the scale-factor(s) into account: */
+    frameBufferSize = scaledForward(frameBufferSize);
+    /* Check against the last full-screen size. */
+    if (frameBufferSize == uisession()->lastFullScreenSize(screenId()) && m_sizeHintOverride.isValid())
         return m_sizeHintOverride;
 
@@ -977 +992 @@
             /* Adjust maximum-size restriction for machine-view: */
             setMaximumSize(sizeHint());
-
-            /* Disable the resize hint override hack: */
-            m_sizeHintOverride = QSize(-1, -1);
 
             /* Force machine-window update own layout: */

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

@@ -1243 +1243 @@
     m_monitorVisibilityVector[0] = true;
 
+    /* Prepare empty last full-screen size vector: */
+    m_monitorLastFullScreenSizeVector.resize(machine().GetMonitorCount());
+    m_monitorLastFullScreenSizeVector.fill(QSize(-1, -1));
+
     /* If machine is in 'saved' state: */
     if (isSaved())
@@ -1925 +1929 @@
 }
 
+QSize UISession::lastFullScreenSize(ulong uScreenId) const
+{
+    /* Make sure index fits the bounds: */
+    AssertReturn(uScreenId < (ulong)m_monitorLastFullScreenSizeVector.size(), QSize(-1, -1));
+
+    /* Return last full-screen size: */
+    return m_monitorLastFullScreenSizeVector.value((int)uScreenId);
+}
+
+void UISession::setLastFullScreenSize(ulong uScreenId, QSize size)
+{
+    /* Make sure index fits the bounds: */
+    AssertReturnVoid(uScreenId < (ulong)m_monitorLastFullScreenSizeVector.size());
+
+    /* Remember last full-screen size: */
+    m_monitorLastFullScreenSizeVector[(int)uScreenId] = size;
+}
+
 int UISession::countOfVisibleWindows()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -227 +227 @@
     void setScreenVisible(ulong uScreenId, bool fIsMonitorVisible);
 
+    /* Last screen full-screen size: */
+    QSize lastFullScreenSize(ulong uScreenId) const;
+    void setLastFullScreenSize(ulong uScreenId, QSize size);
+
     /* Returns existing framebuffer for the given screen-number;
      * Returns 0 (asserts) if screen-number attribute is out of bounds: */
@@ -407 +411 @@
     QVector<bool> m_monitorVisibilityVector;
 
+    /* Screen last full-screen size vector: */
+    QVector<QSize> m_monitorLastFullScreenSizeVector;
+
     /* Frame-buffers vector: */
     QVector<UIFrameBuffer*> m_frameBufferVector;

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

@@ -209 +209 @@
         frameBuffer()->setAutoEnabled(false);
         sltPerformGuestResize(workingArea().size());
+        /* And remember the size to know what we are resizing out of when we exit: */
+        uisession()->setLastFullScreenSize(screenId(), workingArea().size());
     }
 }

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

@@ -145 +145 @@
     setMaxGuestSize(sizeHint);
 
-    if (uisession()->isGuestSupportsGraphics())
-    {
-        /* Temporarily restrict the size to prevent a brief resize to the
-         * framebuffer dimensions (see @a UIMachineView::sizeHint()) before
-         * the following resize() is acted upon.  Expand current limitations
-         * too. */
-        setMaximumSize(sizeHint);
-        m_sizeHintOverride = sizeHint;
-    }
+    /* Temporarily restrict the size to prevent a brief resize to the
+     * frame-buffer dimensions when we exit full-screen.  This is only
+     * applied if the frame-buffer is at full-screen dimensions and
+     * until the first machine view resize. */
+    m_sizeHintOverride = QSize(800, 600).expandedTo(sizeHint);
 
     /* Send saved size-hint to the guest: */

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

@@ -217 +217 @@
         frameBuffer()->setAutoEnabled(false);
         sltPerformGuestResize(workingArea().size());
+        /* And remember the size to know what we are resizing out of when we exit: */
+        uisession()->setLastFullScreenSize(screenId(), workingArea().size());
     }
 }