From 26ffeaae47d5346983c3e8cb943b1a16fe21b213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 26 Mar 2020 23:40:38 +0100 Subject: [PATCH] js: Add missing chain-ups in vfuncs Commit 55b57421d changed signal handlers to the corresponding vfuncs, but didn't always chain up as necessary. In most places this doesn't matter, but at the very least the commit broke activating message list items via the keyboard. Add all (hopefully) the missing chain-ups to get the expected behavior back. https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2319 --- js/gdm/authPrompt.js | 2 +- js/gdm/loginDialog.js | 1 + js/ui/lookingGlass.js | 2 +- js/ui/messageList.js | 2 +- js/ui/panel.js | 2 +- js/ui/slider.js | 2 +- js/ui/workspace.js | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js index 4bcd028ae..a9623f570 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js @@ -120,7 +120,7 @@ var AuthPrompt = GObject.registerClass({ vfunc_key_press_event(keyPressEvent) { if (keyPressEvent.keyval == Clutter.KEY_Escape) this.cancel(); - return Clutter.EVENT_PROPAGATE; + return super.vfunc_key_press_event(keyPressEvent); } _initEntryRow() { diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js index b19f1c662..16a7536ce 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js @@ -177,6 +177,7 @@ var UserList = GObject.registerClass({ } vfunc_key_focus_in() { + super.vfunc_key_focus_in(); this._moveFocusToItems(); } diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js index ed0186cc2..838a0c833 100644 --- a/js/ui/lookingGlass.js +++ b/js/ui/lookingGlass.js @@ -1127,7 +1127,7 @@ class LookingGlass extends St.BoxLayout { else if (symbol == Clutter.KEY_Page_Down) this._notebook.nextTab(); } - return Clutter.EVENT_PROPAGATE; + return super.vfunc_key_press_event(keyPressEvent); } open() { diff --git a/js/ui/messageList.js b/js/ui/messageList.js index 0b4f7db6f..46cfd811c 100644 --- a/js/ui/messageList.js +++ b/js/ui/messageList.js @@ -530,7 +530,7 @@ var Message = GObject.registerClass({ this.close(); return Clutter.EVENT_STOP; } - return Clutter.EVENT_PROPAGATE; + return super.vfunc_key_press_event(keyEvent); } }); diff --git a/js/ui/panel.js b/js/ui/panel.js index ec39cebb6..43f2ddc92 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -964,7 +964,7 @@ class Panel extends St.Widget { return Clutter.EVENT_STOP; } - return Clutter.EVENT_PROPAGATE; + return super.vfunc_key_press_event(keyEvent); } _toggleMenu(indicator) { diff --git a/js/ui/slider.js b/js/ui/slider.js index 3a732e9cf..ba3a233f1 100644 --- a/js/ui/slider.js +++ b/js/ui/slider.js @@ -186,7 +186,7 @@ var Slider = GObject.registerClass({ this.value = Math.max(0, Math.min(this._value + delta, this._maxValue)); return Clutter.EVENT_STOP; } - return Clutter.EVENT_PROPAGATE; + return super.vfunc_key_press_event(keyPressEvent); } _moveHandle(absX, _absY) { diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 5fa818491..0f69a90bd 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -404,7 +404,7 @@ var WindowClone = GObject.registerClass({ return true; } - return false; + return super.key_press_event(keyEvent); } _onClicked() {