Changeset 90701 in vbox

Timestamp:

Aug 17, 2021 10:59:20 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10087: Runtime UI / UIMouseHandler: Couple of bug-fixes for touchpad-based scrolling.

File:

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

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

@@ -653 +653 @@
                         return true;
 #endif /* VBOX_WS_MAC */
-                }
+
+                    /* This event should be also processed using next 'case': */
+                }
+                RT_FALL_THRU();
                 case QEvent::MouseButtonRelease:
                 {
@@ -733 +736 @@
                         machineLogic()->keyboardHandler()->finaliseCaptureKeyboard();
 #endif /* VBOX_WS_X11 */
-                    m_iLastMouseWheelDelta = 0;
+
+                    /* For various mouse click related events
+                     * we also reset last mouse wheel delta: */
+                    if (pEvent->type() != QEvent::MouseMove)
+                        m_iLastMouseWheelDelta = 0;
+
                     if (mouseEvent(pMouseEvent->type(), uScreenId,
                                    pMouseEvent->pos(), pMouseEvent->globalPos(),
@@ -759 +767 @@
                     if (qAbs(m_iLastMouseWheelDelta) >= 120)
                     {
-                        iDelta = m_iLastMouseWheelDelta;
+                        /* Rounding iDelta to the nearest multiple of 120: */
+                        iDelta = m_iLastMouseWheelDelta / 120;
+                        iDelta *= 120;
                         m_iLastMouseWheelDelta = m_iLastMouseWheelDelta % 120;
                     }