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

Timestamp:

Apr 21, 2015 10:34:51 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Reverting r99663 because it's too dangerous, need to be more sharp.

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());
-                    /* 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()))
+                    if (mouseEvent(pDeltaEvent->mouseEventType(), uScreenId,
+                                   m_viewports[uScreenId]->mapFromGlobal(p), p,
+                                   pDeltaEvent->buttons(),
+                                   pDeltaEvent->wheelDelta(), pDeltaEvent->orientation()))
                         return true;
                     break;
@@ -639 +639 @@
                     QMouseEvent *pMouseEvent = static_cast<QMouseEvent*>(pEvent);
                     m_iLastMouseWheelDelta = 0;
-                    /* 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))
+                    if (mouseEvent(pMouseEvent->type(), uScreenId,
+                                   pMouseEvent->pos(), pMouseEvent->globalPos(),
+                                   pMouseEvent->buttons(), 0, Qt::Horizontal))
                         return true;
                     break;
@@ -668 +667 @@
                         m_iLastMouseWheelDelta = m_iLastMouseWheelDelta % 120;
                     }
-                    /* 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()))
+                    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()))
                         return true;
                     break;