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

Timestamp:

Dec 23, 2022 2:28:37 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9898: Migrating UIMouseHandler bits to Qt6.

File:

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

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

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QtMath>
 #include <QMouseEvent>
 #include <QTimer>
@@ -770 +771 @@
                      * guest mouse device at all: */
                     int iDelta = 0;
-#ifdef VBOX_IS_QT6_OR_LATER
-                    Qt::Orientation const enmOrientation = RT_ABS(pWheelEvent->pixelDelta().x())
-                                                         > RT_ABS(pWheelEvent->pixelDelta().y()) ? Qt::Horizontal : Qt::Vertical;
+                    const Qt::Orientation enmOrientation = qFabs(pWheelEvent->angleDelta().x())
+                                                         > qFabs(pWheelEvent->angleDelta().y())
+                                                         ? Qt::Horizontal
+                                                         : Qt::Vertical;
                     m_iLastMouseWheelDelta += enmOrientation == Qt::Horizontal
-                                            ? pWheelEvent->pixelDelta().x() : pWheelEvent->pixelDelta().y();
-#else
-                    m_iLastMouseWheelDelta += pWheelEvent->delta();
-#endif
+                                            ? pWheelEvent->angleDelta().x()
+                                            : pWheelEvent->angleDelta().y();
                     if (qAbs(m_iLastMouseWheelDelta) >= 120)
                     {
@@ -785 +785 @@
                         m_iLastMouseWheelDelta = m_iLastMouseWheelDelta % 120;
                     }
-                    if (mouseEvent(pWheelEvent->type(), uScreenId,
-#ifdef VBOX_IS_QT6_OR_LATER
-                                   pWheelEvent->position().toPoint(), pWheelEvent->globalPosition().toPoint(),
+                    if (mouseEvent(pWheelEvent->type(),
+                                   uScreenId,
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+                                   pWheelEvent->position().toPoint(),
 #else
-                                   pWheelEvent->pos(), pWheelEvent->globalPos(),
+                                   pWheelEvent->pos()
 #endif
+                                   pWheelEvent->globalPosition().toPoint(),
 #ifdef VBOX_WS_MAC
-                                   /* 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: */
+                                   // WORKAROUND:
+                                   // 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 /* !VBOX_WS_MAC */
@@ -800 +803 @@
 #endif /* !VBOX_WS_MAC */
                                    iDelta,
-#ifdef VBOX_IS_QT6_OR_LATER
                                    enmOrientation)
-#else
-                                   pWheelEvent->orientation())
-#endif
                                    )
                         return true;