From 2a9ccf2e2c2f2049b5aacfc163bb45fd36de6a8b Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 23 Apr 2020 19:04:27 -0300 Subject: [PATCH] appDisplay: Return the parent class' result in overrides StButton returns CLUTTER_EVENT_STOP in various circumstances, but AppIcon throws that away and returns CLUTTER_EVENT_PROPAGATE even when it should stop. Return the parent class' result instead of CLUTTER_EVENT_PROPAGATE. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1211 --- js/ui/appDisplay.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index 2d58541f3..8139fe949 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -2213,22 +2213,22 @@ var AppIcon = GObject.registerClass({ } vfunc_button_press_event(buttonEvent) { - super.vfunc_button_press_event(buttonEvent); + const ret = super.vfunc_button_press_event(buttonEvent); if (buttonEvent.button == 1) { this._setPopupTimeout(); } else if (buttonEvent.button == 3) { this.popupMenu(); return Clutter.EVENT_STOP; } - return Clutter.EVENT_PROPAGATE; + return ret; } vfunc_touch_event(touchEvent) { - super.vfunc_touch_event(touchEvent); + const ret = super.vfunc_touch_event(touchEvent); if (touchEvent.type == Clutter.EventType.TOUCH_BEGIN) this._setPopupTimeout(); - return Clutter.EVENT_PROPAGATE; + return ret; } vfunc_clicked(button) {