Fix mouse scroll events firing twice

dpjudas · Nov 19, 2024 · 3ec8761 · 3ec8761
1 parent a06a8ee
commit 3ec8761
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Thirdparty/ZWidget/src/window/wayland/wayland_display_backend.cpp b/Thirdparty/ZWidget/src/window/wayland/wayland_display_backend.cpp
@@ -353,15 +353,14 @@ void WaylandDisplayBackend::ConnectDeviceEvents()
                 if (!currentPointerEvent.axes[idx].valid)
                     continue;
 
-                if (currentPointerEvent.event_mask & POINTER_EVENT_AXIS)
+                if (currentPointerEvent.event_mask & POINTER_EVENT_AXIS_120)
                 {
                     if (idx == uint32_t(wayland::pointer_axis::vertical_scroll) && currentPointerEvent.axes[idx].value > 0)
                         OnMouseWheelEvent(InputKey::MouseWheelDown);
                     if (idx == uint32_t(wayland::pointer_axis::vertical_scroll) && currentPointerEvent.axes[idx].value < 0)
                         OnMouseWheelEvent(InputKey::MouseWheelUp);
                 }
-
-                if (currentPointerEvent.event_mask & POINTER_EVENT_AXIS_120)
+                else if (currentPointerEvent.event_mask & POINTER_EVENT_AXIS)
                 {
                     if (idx == uint32_t(wayland::pointer_axis::vertical_scroll) && currentPointerEvent.axes[idx].value120 > 0)
                         OnMouseWheelEvent(InputKey::MouseWheelDown);