The state of button scrolling should determine whether we filter the event,
not the hardware button state.

Signed-off-by: Peter Hutterer <[email protected]>
---
 src/evdev.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 9be4a96..e272f4b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -273,13 +273,12 @@ evdev_post_trackpoint_scroll(struct evdev_device *device,
                             uint64_t time)
 {
        if (device->scroll.method != LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN ||
-           !hw_is_key_down(device, device->scroll.button))
+           !device->scroll.button_scroll_active)
                return false;
 
-       if (device->scroll.button_scroll_active)
-               evdev_post_scroll(device, time,
-                                 LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,
-                                 &unaccel);
+       evdev_post_scroll(device, time,
+                         LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,
+                         &unaccel);
 
        return true;
 }
-- 
2.5.5

_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to