Changeset 50784 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 14, 2014 10:32:36 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mouse handler: More appropriate hovered widget fetching which works even in case of 3D overlay presence.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (1 diff)

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

@@ -548 +548 @@
                 case QEvent::MouseButtonRelease:
                 {
+                    /* Get mouse-event: */
+                    QMouseEvent *pOldMouseEvent = static_cast<QMouseEvent*>(pEvent);
+
+                    /* Check which viewport(s) we *probably* hover: */
+                    QWidgetList probablyHoveredViewports;
+                    foreach (QWidget *pViewport, m_viewports)
+                    {
+                        QPoint posInViewport = pViewport->mapFromGlobal(pOldMouseEvent->globalPos());
+                        if (pViewport->geometry().contains(posInViewport))
+                            probablyHoveredViewports << pViewport;
+                    }
+                    /* Determine actually hovered viewport: */
+                    QWidget *pHoveredWidget = probablyHoveredViewports.isEmpty() ? 0 :
+                                              probablyHoveredViewports.contains(pWatchedWidget) ? pWatchedWidget :
+                                              probablyHoveredViewports.first();
+
                     /* Check if we should propagate this event to another window: */
-                    QWidget *pHoveredWidget = QApplication::widgetAt(QCursor::pos());
                     if (pHoveredWidget && pHoveredWidget != pWatchedWidget && m_viewports.values().contains(pHoveredWidget))
                     {
-                        /* Get current mouse-move event: */
-                        QMouseEvent *pOldMouseEvent = static_cast<QMouseEvent*>(pEvent);
-
                         /* Prepare redirected mouse-move event: */
                         QMouseEvent *pNewMouseEvent = new QMouseEvent(pOldMouseEvent->type(),