From fec40b71631ed0e5104b92d53340764198d37c35 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Tue, 28 Mar 2023 13:35:36 -0600 Subject: [PATCH] Revert "backends/libinput: don't multiply v120 value by scroll speed" This reverts commit 9cd52b4060d5db3c7b10340e78236b3c216567cb. This commit broke the adjustable scroll speed feature on Wayland. That feature may not have been implemented in the most technically ideal way, but simply breaking it and leaving the mouse KCM with UI control that does nothing isn't great. Besides, there was always a simple way to avoid any scroll-related regressions caused by this feature: reset the scroll speed to its default value, which internally is a multiplier of 1 and exercises the same codepath that 9cd52b40 imposes on everyone. We can come up with a better implementation for Plasma 6. BUG: 464592 FIXED-IN: 5.27.4 --- src/backends/libinput/events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/libinput/events.cpp b/src/backends/libinput/events.cpp index c6edde4bca..bd8facd3d9 100644 --- a/src/backends/libinput/events.cpp +++ b/src/backends/libinput/events.cpp @@ -211,7 +211,7 @@ qint32 PointerEvent::scrollValueV120(InputRedirection::PointerAxis axis) const const libinput_pointer_axis a = (axis == InputRedirection::PointerAxisHorizontal) ? LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL : LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; - return libinput_event_pointer_get_scroll_value_v120(m_pointerEvent, a); + return libinput_event_pointer_get_scroll_value_v120(m_pointerEvent, a) * device()->scrollFactor(); } TouchEvent::TouchEvent(libinput_event *event, libinput_event_type type)