Changeset 94024 in vbox for trunk/src/VBox

Timestamp:

Mar 1, 2022 10:47:31 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: QWheelEvent has dropped qt4 compatibility stuff like orientation(), delta(), pos(), globalPos(). The posF() and globalPosF() functions have been renamed position() and globalPosition(). The orientation() and delta() was replaced by pixelDelta and angelDelta in qt 5.0. We probably should use the latter, but I opted for the former as that maps better to the code. Someone else can try bring it up to qt5/6 standards. bugref:9898

File:

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

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

@@ -758 +758 @@
                      * guest mouse device at all: */
                     int iDelta = 0;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                    Qt::Orientation const enmOrientation = RT_ABS(pWheelEvent->pixelDelta().x())
+                                                         > RT_ABS(pWheelEvent->pixelDelta().y()) ? Qt::Horizontal : Qt::Vertical;
+                    m_iLastMouseWheelDelta += enmOrientation == Qt::Horizontal
+                                            ? pWheelEvent->pixelDelta().x() : pWheelEvent->pixelDelta().y();
+#else
                     m_iLastMouseWheelDelta += pWheelEvent->delta();
+#endif
                     if (qAbs(m_iLastMouseWheelDelta) >= 120)
                     {
@@ -767 +774 @@
                     }
                     if (mouseEvent(pWheelEvent->type(), uScreenId,
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /** @todo .... */
+                                   pWheelEvent->position().toPoint(), pWheelEvent->globalPosition().toPoint(),
+#else
                                    pWheelEvent->pos(), pWheelEvent->globalPos(),
+#endif
 #ifdef VBOX_WS_MAC
                                    /* Qt Cocoa is buggy. It always reports a left button pressed when the
@@ -776 +787 @@
                                    pWheelEvent->buttons(),
 #endif /* !VBOX_WS_MAC */
-                                   iDelta, pWheelEvent->orientation()))
+                                   iDelta,
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                                   enmOrientation)
+#else
+                                   pWheelEvent->orientation())
+#endif
+                                   )
                         return true;
                     break;