isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swipeTracker: Reject touchpad swipes in the wrong directions

Browse Source 
We now have multiple touch swipe gestures with matching fingers and
different directions set on the overview hierarchy. Accepting all
touchpad swipes without checking the direction makes one of these gestures
take control of input, without other gestures having a say on this.

So, look for the direction of the swipe events and look if it matches
the expected orientation.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1643>
This commit is contained in:
Florian Müllner 2020-06-10 01:45:08 +02:00 committed by Carlos Garnacho
parent 8edfe1dcf6
commit e135f077fb
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/swipeTracker.js
View File

@ -124,6 +124,17 @@ const TouchpadSwipeGesture = GObject.registerClass({
let [x, y] = event.get_coords();
let [dx, dy] = event.get_gesture_motion_delta();
let gestureOrientation = -1;
if (dx !== dy) {
gestureOrientation = Math.abs(dx) > Math.abs(dy)
? Clutter.Orientation.HORIZONTAL
: Clutter.Orientation.VERTICAL;
}
if (gestureOrientation >= 0 &&
gestureOrientation !== this.orientation)
return Clutter.EVENT_PROPAGATE;
const vertical = this.orientation === Clutter.Orientation.VERTICAL;
let delta = (vertical ? dy : dx) * SWIPE_MULTIPLIER;
const distance = vertical ? TOUCHPAD_BASE_HEIGHT : TOUCHPAD_BASE_WIDTH;
@ -146,7 +157,9 @@ const TouchpadSwipeGesture = GObject.registerClass({
break;
}
return Clutter.EVENT_STOP;
return gestureOrientation === this.orientation
? Clutter.EVENT_STOP
: Clutter.EVENT_PROPAGATE;
}
destroy() {