tablet: remove an always-true part of an if condition
authorPeter Hutterer <peter.hutterer@who-t.net>
Fri, 6 May 2022 04:57:40 +0000 (14:57 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Mon, 23 May 2022 05:43:18 +0000 (05:43 +0000)
A few lines north of here we return early if neither bit is set. If we
get to this point, at least one bit is set so this part of the condition
always evaluates to true.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
src/evdev-tablet.c

index 58cc46d8dc80483112ecd9382fa0fbe16ce19b59..7121328e61118cc8e89c1d46cbbccec3a1a8a492 100644 (file)
@@ -1257,8 +1257,6 @@ sanitize_pressure_distance(struct tablet_dispatch *tablet,
 
        /* Keep distance and pressure mutually exclusive */
        if (distance &&
-           (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_DISTANCE) ||
-            bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) &&
            distance->value > distance->minimum &&
            pressure->value > pressure->minimum) {
                if (tool_in_contact) {