touchpad: reduce minimum height for horiz edge scrolling to 40mm

Introduced in commit 8e7f99c27ab39 we only allowed horizontal edge scrolling
on devices larger than 50mm to leave enough reactive space on the touchpad.
Looking at a ruler, a 50mm high touchpad is still large enough to leave the
bottom 7mm as an horizontal edge scroll area. Reduce the minimum size to 40mm
instead, that's closer to where it starts to get a bit iffy.

https://bugzilla.redhat.com/show_bug.cgi?id=1422221

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c
index 7da44aecc45ccfdf934ba65f9c15f2223a2e3427..9f6660ca7d44f6c54176994d97526676650512e6 100644 (file)
--- a/src/evdev-mt-touchpad-edge-scroll.c
+++ b/src/evdev-mt-touchpad-edge-scroll.c
@@ -282,14 +282,14 @@ tp_edge_scroll_init(struct tp_dispatch *tp, struct evdev_device *device)
        struct phys_coords mm = { 0.0, 0.0 };
 
        evdev_device_get_size(device, &width, &height);
-       /* Touchpads smaller than 50mm are not tall enough to have a
+       /* Touchpads smaller than 40mm are not tall enough to have a
           horizontal scroll area, it takes too much space away. But
           clickpads have enough space here anyway because of the
           software button area (and all these tiny clickpads were built
           when software buttons were a thing, e.g. Lenovo *20 series)
         */
        if (!tp->buttons.is_clickpad)
-           want_horiz_scroll = (height >= 50);
+           want_horiz_scroll = (height >= 40);
 
        /* 7mm edge size */
        mm.x = width - 7;

diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index 4656443c84f7ff4ebdd2961b0ce3ca5d5259166a..29039b35d5d6113396317522db23fb28b88aac73 100644 (file)
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -462,7 +462,7 @@ touchpad_has_horiz_edge_scroll_size(struct litest_device *dev)
 
        rc = libinput_device_get_size(dev->libinput_device, &width, &height);
 
-       return rc == 0 && height >= 50;
+       return rc == 0 && height >= 40;
 }
 
 START_TEST(touchpad_edge_scroll_horiz)