Changeset 55336 in vbox

Timestamp:

Apr 20, 2015 12:06:38 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mouse-handler: Get the actual mouse-buttons from the QApplication instead of the invalid going from the mouse-events.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (3 diffs)

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

@@ -561 +561 @@
                     QPoint p = QPoint(pDeltaEvent->xDelta() + m_lastMousePos.x(),
                                       pDeltaEvent->yDelta() + m_lastMousePos.y());
-                    if (mouseEvent(pDeltaEvent->mouseEventType(), uScreenId,
-                                   m_viewports[uScreenId]->mapFromGlobal(p), p,
-                                   pDeltaEvent->buttons(),
-                                   pDeltaEvent->wheelDelta(), pDeltaEvent->orientation()))
+                    /* Old Qt versions had a bug where mouse-buttons coming with the event were not quite valid.
+                     * For now we will be asking the QApplication for the valid button combination instead. */
+                    if (mouseEvent(pDeltaEvent->mouseEventType(), uScreenId, m_viewports[uScreenId]->mapFromGlobal(p), p,
+                                   QApplication::mouseButtons(), pDeltaEvent->wheelDelta(), pDeltaEvent->orientation()))
                         return true;
                     break;
@@ -639 +639 @@
                     QMouseEvent *pMouseEvent = static_cast<QMouseEvent*>(pEvent);
                     m_iLastMouseWheelDelta = 0;
-                    if (mouseEvent(pMouseEvent->type(), uScreenId,
-                                   pMouseEvent->pos(), pMouseEvent->globalPos(),
-                                   pMouseEvent->buttons(), 0, Qt::Horizontal))
+                    /* Old Qt versions had a bug where mouse-buttons coming with the event were not quite valid.
+                     * For now we will be asking the QApplication for the valid button combination instead. */
+                    if (mouseEvent(pMouseEvent->type(), uScreenId, pMouseEvent->pos(), pMouseEvent->globalPos(),
+                                   QApplication::mouseButtons(), 0, Qt::Horizontal))
                         return true;
                     break;
@@ -667 +668 @@
                         m_iLastMouseWheelDelta = m_iLastMouseWheelDelta % 120;
                     }
-                    if (mouseEvent(pWheelEvent->type(), uScreenId,
-                                   pWheelEvent->pos(), pWheelEvent->globalPos(),
-#ifdef QT_MAC_USE_COCOA
-                                   /* Qt Cocoa is buggy. It always reports a left button pressed when the
-                                    * mouse wheel event occurs. A workaround is to ask the application which
-                                    * buttons are pressed currently: */
-                                   QApplication::mouseButtons(),
-#else /* QT_MAC_USE_COCOA */
-                                   pWheelEvent->buttons(),
-#endif /* !QT_MAC_USE_COCOA */
-                                   iDelta, pWheelEvent->orientation()))
+                    /* Old Qt versions had a bug where mouse-buttons coming with the event were not quite valid.
+                     * For now we will be asking the QApplication for the valid button combination instead. */
+                    if (mouseEvent(pWheelEvent->type(), uScreenId, pWheelEvent->pos(), pWheelEvent->globalPos(),
+                                   QApplication::mouseButtons(), iDelta, pWheelEvent->orientation()))
                         return true;
                     break;