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

lookingGlass: Handle Esc in object inspector

Browse Source 
Currently the main looking glass dialog handles Esc for both itself
and the object inspector. However as the latter now takes its own
Clutter.Grab, key events never reach the main dialog while the
inspector is open.

Fix this by handling the Esc key in the object inspector itself.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5356

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2271>
This commit is contained in:
Florian Müllner 2022-04-18 17:23:45 +02:00 committed by Marge Bot
parent 56d0b6d831
commit 5a4c19a8cb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/lookingGlass.js
View File

@ -486,6 +486,15 @@ class ObjInspector extends St.ScrollView {
this._obj = null;
}
vfunc_key_press_event(keyPressEvent) {
const symbol = keyPressEvent.keyval;
if (symbol === Clutter.KEY_Escape) {
this.close();
return Clutter.EVENT_STOP;
}
return super.vfunc_key_press_event(keyPressEvent);
}
_onInsert() {
let obj = this._obj;
this.close();
@ -1578,10 +1587,7 @@ class LookingGlass extends St.BoxLayout {
vfunc_key_press_event(keyPressEvent) {
let symbol = keyPressEvent.keyval;
if (symbol == Clutter.KEY_Escape) {
if (this._objInspector.visible)
this._objInspector.close();
else
this.close();
this.close();
return Clutter.EVENT_STOP;
}
// Ctrl+PgUp and Ctrl+PgDown switches tabs in the notebook view