Changeset 39066 in vbox

Timestamp:

Oct 20, 2011 10:09:47 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: suppress resizing the view window on intermediary or redundant resize events from display.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)

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

@@ -841 +841 @@
     UIResizeEvent *pResizeEvent = static_cast<UIResizeEvent*>(pEvent);
 
+    /** If only the pitch has changed (or nothing at all!) we only update the
+     * framebuffer and don't touch the window.  This prevents unwanted resizes
+     * when entering or exiting fullscreen on X.Org guests and when
+     * re-attaching the framebuffer on a view switch. */
+    bool fResize =    pResizeEvent->width() != frameBuffer()->width()
+                   || pResizeEvent->height() != frameBuffer()->height();
+
     /* Perform framebuffer resize: */
     frameBuffer()->resizeEvent(pResizeEvent);
 
-    /* Reapply maximum size restriction for machine-view: */
-    setMaximumSize(sizeHint());
-
-    /* Perform machine-view resize: */
-    resize(pResizeEvent->width(), pResizeEvent->height());
-
-    /* May be we have to restrict minimum size? */
-    maybeRestrictMinimumSize();
-
-    /* Let our toplevel widget calculate its sizeHint properly: */
-    QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+    if (fResize)
+    {
+        /* Reapply maximum size restriction for machine-view: */
+        setMaximumSize(sizeHint());
+
+        /* Perform machine-view resize: */
+        resize(pResizeEvent->width(), pResizeEvent->height());
+
+        /* May be we have to restrict minimum size? */
+        maybeRestrictMinimumSize();
+
+        /* Let our toplevel widget calculate its sizeHint properly: */
+        QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
 
 #ifdef Q_WS_MAC
-    machineLogic()->updateDockIconSize(screenId(), pResizeEvent->width(), pResizeEvent->height());
+        machineLogic()->updateDockIconSize(screenId(), pResizeEvent->width(), pResizeEvent->height());
 #endif /* Q_WS_MAC */
 
-    /* Update machine-view sliders: */
-    updateSliders();
-
-    /* Normalize machine-window geometry: */
-    if (!fFullscreenOrSeamless)
-        normalizeGeometry(true /* Adjust Position? */);
+        /* Update machine-view sliders: */
+        updateSliders();
+
+        /* Normalize machine-window geometry: */
+        if (!fFullscreenOrSeamless)
+            normalizeGeometry(true /* Adjust Position? */);
+    }
 
     /* Report to the VM thread that we finished resizing: */

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

@@ -222 +222 @@
         QString strHintSent = machine.GetExtraData(strKey);
         if (!strHintSent.isEmpty())
-            sltPerformGuestResize(guestSizeHint());
+        {
+            QSize hint = guestSizeHint();
+            resize(hint);
+            sltPerformGuestResize(hint);
+        }
     }
 }