Merge branch 'main' into leolost/reduce-ws-sensitivity

lenemter · web-flow · commit 9652ccdf0808 · 2025-11-14T19:08:14.000+03:00
diff --git a/lib/Gestures/TouchpadBackend.vala b/lib/Gestures/TouchpadBackend.vala
@@ -56,11 +56,12 @@ private class Gala.TouchpadBackend : Object, GestureBackend {
             return Clutter.EVENT_PROPAGATE;
         }
 
-        if (state == IGNORED) {
-            if (event.get_gesture_phase () == END || event.get_gesture_phase () == CANCEL) {
-                reset ();
-            }
+        if (state != ONGOING && (event.get_gesture_phase () == END || event.get_gesture_phase () == CANCEL)) {
+            reset ();
+            return Clutter.EVENT_PROPAGATE;
+        }
 
+        if (state == IGNORED) {
             return Clutter.EVENT_PROPAGATE;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,12 @@ private class Gala.TouchpadBackend : Object, GestureBackend {`
`56`	`56`	`return Clutter.EVENT_PROPAGATE;`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (state == IGNORED) {`
`60`		`- if (event.get_gesture_phase () == END \|\| event.get_gesture_phase () == CANCEL) {`
`61`		`- reset ();`
`62`		`- }`
	`59`	`+ if (state != ONGOING && (event.get_gesture_phase () == END \|\| event.get_gesture_phase () == CANCEL)) {`
	`60`	`+ reset ();`
	`61`	`+ return Clutter.EVENT_PROPAGATE;`
	`62`	`+ }`
`63`	`63`
	`64`	`+ if (state == IGNORED) {`
`64`	`65`	`return Clutter.EVENT_PROPAGATE;`
`65`	`66`	`}`
`66`	`67`