mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-05-05 06:27:59 +02:00
evdev: always default to the middle button for button-scrolling
The current code only defaulted to the middle button for those devices that used button scrolling by default, requiring the user to enable button scrolling _and_ set the button before it is active. This causes some confusion. There is no real benefit to leaving the button at 0 when the scroll method isn't enabled anyway. So always default to the middle button (if available). https://bugzilla.redhat.com/show_bug.cgi?id=1227182 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
9d84dddf91
commit
5b940e6a3f
1 changed files with 1 additions and 8 deletions
|
|
@ -1112,14 +1112,7 @@ evdev_scroll_get_default_button(struct libinput_device *device)
|
|||
{
|
||||
struct evdev_device *evdev = (struct evdev_device *)device;
|
||||
|
||||
if (libevdev_has_property(evdev->evdev, INPUT_PROP_POINTING_STICK))
|
||||
return BTN_MIDDLE;
|
||||
|
||||
/* A device that defaults to button scrolling defaults
|
||||
to BTN_MIDDLE */
|
||||
if (evdev_scroll_get_default_method(device) ==
|
||||
LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
|
||||
libevdev_has_event_code(evdev->evdev, EV_KEY, BTN_MIDDLE))
|
||||
if( libevdev_has_event_code(evdev->evdev, EV_KEY, BTN_MIDDLE))
|
||||
return BTN_MIDDLE;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue