Changeset 100351 in vbox

Timestamp:

Jul 3, 2023 3:04:01 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10450: Remaining migration fixes for mouse/touch related events.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

-              r100245
+              r100351
 void UIChart::mouseMoveEvent(QMouseEvent *pEvent)
+{
+#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos, x, y were replaced with QSinglePointEvent::position in Qt6 */
     int iX = width() - pEvent->x() - m_iMarginRight;
+#else
+    int iX = width() - pEvent->position().x() - m_iMarginRight;
+#endif
     m_iDataIndexUnderCursor = -1;
     if (iX > m_iMarginLeft && iX <= width() - m_iMarginRight)

-              r100344
+              r100351
         return true;
+#ifndef VBOX_IS_QT6_OR_LATER /* QTouchEvent::TouchPoint was replaced by QEventPoint in 6.0 */
     QVector<LONG64> contacts(pTouchEvent->touchPoints().size());
+#else
+    QVector<LONG64> contacts(pTouchEvent->points().size());
+#endif
     long xShift = 0, yShift = 0;
 …
         } else {
             /* Get relative touch-point normalized position: */
+#ifndef VBOX_IS_QT6_OR_LATER /* QEventPoint::pos was replaced with QEventPoint::position in Qt6 */
             QPointF rawTouchPoint = touchPoint.normalizedPos();
+#else
+            QPointF rawTouchPoint = touchPoint.normalizedPosition();
+#endif
             /* Pass relative touch-point data as Normalized Integer: */
 …
+    }
     uimachine()->putEventMultiTouch(pTouchEvent->touchPoints().size(),
+    uimachine()->putEventMultiTouch(contacts.size(),
                                     contacts,
                                     fTouchScreen,

Note: See TracChangeset for help on using the changeset viewer.