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

keyboard: Allow calling _release() without press on OSK keys with touch

Browse Source 
This is already allowed for pointer events, but touch events still expected
that the touch begin and end happen on the same Key actor. Change this
behavior for touch events, this is necessary for the tap-drag-release
pattern to select key variants to work on all input devices.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1789>
This commit is contained in:
Carlos Garnacho 2021-03-22 18:01:39 +01:00
parent 6ee2c4f74c
commit 40e53492ab
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/ui/keyboard.js
View File

@ -347,7 +347,7 @@ var Key = GObject.registerClass({
this.emit('long-press');
if (this._extendedKeys.length > 0) {
this._touchPressed = false;
this._touchPressSlot = null;
this._ensureExtendedKeysPopup();
this.keyButton.set_hover(false);
this.keyButton.fake_release();
@ -378,7 +378,7 @@ var Key = GObject.registerClass({
GLib.source_remove(this._pressTimeoutId);
this._pressTimeoutId = 0;
}
this._touchPressed = false;
this._touchPressSlot = null;
this.keyButton.set_hover(false);
this.keyButton.fake_release();
}
@ -459,14 +459,19 @@ var Key = GObject.registerClass({
if (!Meta.is_wayland_compositor())
return Clutter.EVENT_PROPAGATE;
if (!this._touchPressed &&
const slot = event.get_event_sequence().get_slot();
if (!this._touchPressSlot &&
event.type() == Clutter.EventType.TOUCH_BEGIN) {
this._touchPressed = true;
this._touchPressSlot = slot;
this._press(key);
} else if (this._touchPressed &&
event.type() == Clutter.EventType.TOUCH_END) {
this._touchPressed = false;
this._release(key);
} else if (event.type() === Clutter.EventType.TOUCH_END) {
if (!this._touchPressSlot ||
this._touchPressSlot === slot)
this._release(key);
if (this._touchPressSlot === slot)
this._touchPressSlot = null;
}
return Clutter.EVENT_PROPAGATE;
});