Changeset 46360 in vbox

Timestamp:

Jun 3, 2013 12:42:17 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6749: Runtime UI: Guest resize-request handling cleanup/rework.

Location:

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

Files:

• UIMachineView.cpp (modified) (2 diffs)
• UIMachineView.h (modified) (1 diff)

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

@@ -205 +205 @@
 }
 
-void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iW, int iH)
+bool UIMachineView::guestResizeEvent(QEvent *pEvent,
+                                     bool fFullscreenOrSeamless)
+{
+    /* Some situations require framebuffer resize events to be ignored at all,
+     * leaving machine-window, machine-view and framebuffer sizes preserved: */
+    if (uisession()->isGuestResizeIgnored())
+        return true;
+
+    /* Get guest resize-event: */
+    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 if parent window is visible: */
+    if (uisession()->isScreenVisible(m_uScreenId))
+        frameBuffer()->resizeEvent(pResizeEvent);
+
+    if (fResize && uisession()->isScreenVisible(m_uScreenId))
+    {
+        /* Reapply maximum size restriction for machine-view: */
+        setMaximumSize(sizeHint());
+
+        /* Disable the resize hint override hack: */
+        m_sizeHintOverride = QSize(-1, -1);
+
+        /* Perform machine-view resize: */
+        resize(pResizeEvent->width(), pResizeEvent->height());
+
+        /* Let our toplevel widget calculate its sizeHint properly: */
+        QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+
+#ifdef Q_WS_MAC
+        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? */);
+    }
+
+    /* Report to the VM thread that we finished resizing: */
+    session().GetConsole().GetDisplay().ResizeCompleted(screenId());
+
+    /* Emit a signal about guest was resized: */
+    emit resizeHintDone();
+
+    pEvent->accept();
+    return true;
+}
+
+void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iWidth, int iHeight)
 {
     /* Update corresponding viewport part: */
-    viewport()->update(iX - contentsX(), iY - contentsY(), iW, iH);
+    viewport()->update(iX - contentsX(), iY - contentsY(), iWidth, iHeight);
 }
 
@@ -843 +901 @@
 #endif /* Q_WS_MAC */
 
-bool UIMachineView::guestResizeEvent(QEvent *pEvent,
-                                     bool fFullscreenOrSeamless)
-{
-    /* Some situations require framebuffer resize events to be ignored at all,
-     * leaving machine-window, machine-view and framebuffer sizes preserved: */
-    if (uisession()->isGuestResizeIgnored())
-        return true;
-
-    /* Get guest resize-event: */
-    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 if parent window is visible: */
-    if (uisession()->isScreenVisible(m_uScreenId))
-        frameBuffer()->resizeEvent(pResizeEvent);
-
-    if (fResize && uisession()->isScreenVisible(m_uScreenId))
-    {
-        /* Reapply maximum size restriction for machine-view: */
-        setMaximumSize(sizeHint());
-
-        /* Disable the resize hint override hack: */
-        m_sizeHintOverride = QSize(-1, -1);
-
-        /* Perform machine-view resize: */
-        resize(pResizeEvent->width(), pResizeEvent->height());
-
-        /* Let our toplevel widget calculate its sizeHint properly: */
-        QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
-
-#ifdef Q_WS_MAC
-        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? */);
-    }
-
-    /* Report to the VM thread that we finished resizing: */
-    session().GetConsole().GetDisplay().ResizeCompleted(screenId());
-
-    /* Emit a signal about guest was resized: */
-    emit resizeHintDone();
-
-    pEvent->accept();
-    return true;
-}
-
 UIVisualStateType UIMachineView::visualStateType() const
 {

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

@@ -93 +93 @@
 
     /* Handler: Frame-buffer NotifyUpdate stuff: */
-    virtual void sltHandleNotifyUpdate(int iX, int iY, int iW, int iH);
+    void sltHandleNotifyUpdate(int iX, int iY, int iWidth, int iHeight);
 
     /* Watch dog for desktop resizes: */