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

Timestamp:

Nov 10, 2016 11:09:22 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: UIDesktopWidgetWatchdog: Make invisible windows handle not just resize but move events as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -63 +63 @@
 private:
 
+    /** Move @a pEvent handler. */
+    void moveEvent(QMoveEvent *pEvent);
     /** Resize @a pEvent handler. */
     void resizeEvent(QResizeEvent *pEvent);
 
     /** Holds the index of the host-screen this window created for. */
-    int m_iHostScreenIndex;
+    const int m_iHostScreenIndex;
+
+    /** Holds whether the move event came. */
+    bool m_fMoveCame;
+    /** Holds whether the resize event came. */
+    bool m_fResizeCame;
 };
 
@@ -78 +85 @@
     : QWidget(0, Qt::Window | Qt::FramelessWindowHint)
     , m_iHostScreenIndex(iHostScreenIndex)
+    , m_fMoveCame(false)
+    , m_fResizeCame(false)
 {
     /* Resize to minimum size of 1 pixel: */
@@ -88 +97 @@
 }
 
-void UIInvisibleWindow::resizeEvent(QResizeEvent *pEvent)
-{
+void UIInvisibleWindow::moveEvent(QMoveEvent *pEvent)
+{
+    /* We do have both move and resize events,
+     * with no idea who will come first, but we need
+     * to send a final signal after last of events arrived. */
+
     /* Call to base-class: */
-    QWidget::resizeEvent(pEvent);
+    QWidget::moveEvent(pEvent);
 
     /* Ignore 'not-yet-shown' case: */
@@ -97 +110 @@
         return;
 
-    /* Notify listeners about host-screen available-geometry was calulated: */
-    emit sigHostScreenAvailableGeometryCalculated(m_iHostScreenIndex, QRect(x(), y(), width(), height()));
+    /* Mark move event as received: */
+    m_fMoveCame = true;
+
+    /* If the resize event already came: */
+    if (m_fResizeCame)
+    {
+        /* Notify listeners about host-screen available-geometry was calulated: */
+        LogRel2(("GUI: UIInvisibleWindow::moveEvent: Screen: %d, work area: %dx%d x %dx%d\n", m_iHostScreenIndex,
+                 x(), y(), width(), height()));
+        emit sigHostScreenAvailableGeometryCalculated(m_iHostScreenIndex, QRect(x(), y(), width(), height()));
+    }
+}
+
+void UIInvisibleWindow::resizeEvent(QResizeEvent *pEvent)
+{
+    /* We do have both move and resize events,
+     * with no idea who will come first, but we need
+     * to send a final signal after last of events arrived. */
+
+    /* Call to base-class: */
+    QWidget::resizeEvent(pEvent);
+
+    /* Ignore 'not-yet-shown' case: */
+    if (!isVisible())
+        return;
+
+    /* Mark resize event as received: */
+    m_fResizeCame = true;
+
+    /* If the move event already came: */
+    if (m_fMoveCame)
+    {
+        /* Notify listeners about host-screen available-geometry was calulated: */
+        LogRel2(("GUI: UIInvisibleWindow::resizeEvent: Screen: %d, work area: %dx%d x %dx%d\n", m_iHostScreenIndex,
+                 x(), y(), width(), height()));
+        emit sigHostScreenAvailableGeometryCalculated(m_iHostScreenIndex, QRect(x(), y(), width(), height()));
+    }
 }
 
@@ -530 +578 @@
 
         /* Place worker to corresponding host-screen: */
-        pWorker->move(hostScreenGeometry.topLeft());
+        pWorker->move(hostScreenGeometry.center());
         /* And finally, maximize it: */
         pWorker->showMaximized();