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

keyboard: Implement Key object 'long-press' signal

Browse Source 
This signal may be emitted on any key, regardless of extended keys, so
make the timeout useful for both situations.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/46
This commit is contained in:
Carlos Garnacho 2018-02-15 12:18:59 +01:00
parent f8abe073eb
commit d8fd7b5a44
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/ui/keyboard.js
View File

@ -263,6 +263,7 @@ var Key = new Lang.Class({
this._capturedPress = false; this._capturedPress = false;
this._capturedEventId = 0; this._capturedEventId = 0;
this._unmapId = 0; this._unmapId = 0;
this._longPress = false;
}, },
_onDestroy: function() { _onDestroy: function() {
@ -298,16 +299,25 @@ var Key = new Lang.Class({
_press: function(key) { _press: function(key) {
if (key != this.key || this._extended_keys.length == 0) { if (key != this.key || this._extended_keys.length == 0) {
this.emit('pressed', this._getKeyval(key), key); this.emit('pressed', this._getKeyval(key), key);
} else if (key == this.key) { }
if (key == this.key) {
this._pressTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, this._pressTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
KEY_LONG_PRESS_TIME, KEY_LONG_PRESS_TIME,
Lang.bind(this, function() { Lang.bind(this, function() {
this.keyButton.set_hover(false); this._longPress = true;
this.keyButton.fake_release();
this._pressTimeoutId = 0; this._pressTimeoutId = 0;
this._touchPressed = false;
this._ensureExtendedKeysPopup(); this.emit('long-press');
this._showSubkeys();
if (this._extended_keys.length > 0) {
this._touchPressed = false;
this.keyButton.set_hover(false);
this.keyButton.fake_release();
this._ensureExtendedKeysPopup();
this._showSubkeys();
}
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
})); }));
} }
@ -317,11 +327,14 @@ var Key = new Lang.Class({
if (this._pressTimeoutId != 0) { if (this._pressTimeoutId != 0) {
GLib.source_remove(this._pressTimeoutId); GLib.source_remove(this._pressTimeoutId);
this._pressTimeoutId = 0; this._pressTimeoutId = 0;
this.emit('pressed', this._getKeyval(key), key);
} }
if (!this._longPress && key == this.key && this._extended_keys.length > 0)
this.emit('pressed', this._getKeyval(key), key);
this.emit('released', this._getKeyval(key), key); this.emit('released', this._getKeyval(key), key);
this._hideSubkeys(); this._hideSubkeys();
this._longPress = false;
}, },
_onCapturedEvent: function(actor, event) { _onCapturedEvent: function(actor, event) {