screenShield: Remove key press event handler
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
parent
803a6dcfb0
commit
806d3b37cd
@ -53,8 +53,6 @@ var ScreenShield = class {
|
|||||||
name: 'lockScreenGroup',
|
name: 'lockScreenGroup',
|
||||||
visible: false,
|
visible: false,
|
||||||
});
|
});
|
||||||
this._lockScreenGroup.connect('key-press-event',
|
|
||||||
this._onLockScreenKeyPress.bind(this));
|
|
||||||
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
|
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
|
||||||
|
|
||||||
this._lockDialogGroup = new St.Widget({ x_expand: true,
|
this._lockDialogGroup = new St.Widget({ x_expand: true,
|
||||||
@ -169,35 +167,6 @@ var ScreenShield = class {
|
|||||||
return this._isModal;
|
return this._isModal;
|
||||||
}
|
}
|
||||||
|
|
||||||
_onLockScreenKeyPress(actor, event) {
|
|
||||||
let symbol = event.get_key_symbol();
|
|
||||||
let unichar = event.get_key_unicode();
|
|
||||||
|
|
||||||
// Do nothing if the lock screen is not fully shown.
|
|
||||||
// This avoids reusing the previous (and stale) unlock
|
|
||||||
// dialog if esc is pressed while the curtain is going
|
|
||||||
// down after cancel.
|
|
||||||
|
|
||||||
if (this._lockScreenState != MessageTray.State.SHOWN)
|
|
||||||
return Clutter.EVENT_PROPAGATE;
|
|
||||||
|
|
||||||
let isEnter = symbol == Clutter.KEY_Return ||
|
|
||||||
symbol == Clutter.KEY_KP_Enter ||
|
|
||||||
symbol == Clutter.KEY_ISO_Enter;
|
|
||||||
let isEscape = symbol == Clutter.KEY_Escape;
|
|
||||||
let isLiftChar = GLib.unichar_isprint(unichar) &&
|
|
||||||
(this._isLocked || !GLib.unichar_isgraph(unichar));
|
|
||||||
if (!isEnter && !isEscape && !isLiftChar)
|
|
||||||
return Clutter.EVENT_PROPAGATE;
|
|
||||||
|
|
||||||
if (this._isLocked &&
|
|
||||||
this._ensureUnlockDialog(true) &&
|
|
||||||
GLib.unichar_isgraph(unichar))
|
|
||||||
this._dialog.addCharacter(unichar);
|
|
||||||
|
|
||||||
return Clutter.EVENT_STOP;
|
|
||||||
}
|
|
||||||
|
|
||||||
_syncInhibitor() {
|
_syncInhibitor() {
|
||||||
let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
|
let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
|
||||||
let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
|
let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
|
||||||
|
Loading…
Reference in New Issue
Block a user