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

appDisplay: Return the parent class' result in overrides

Browse Source 
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
This commit is contained in:
Georges Basile Stavracas Neto 2020-04-23 19:04:27 -03:00
parent 2909d91c13
commit 2a9ccf2e2c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/appDisplay.js
View File

@ -2213,22 +2213,22 @@ var AppIcon = GObject.registerClass({
} }
vfunc_button_press_event(buttonEvent) { vfunc_button_press_event(buttonEvent) {
super.vfunc_button_press_event(buttonEvent); const ret = super.vfunc_button_press_event(buttonEvent);
if (buttonEvent.button == 1) { if (buttonEvent.button == 1) {
this._setPopupTimeout(); this._setPopupTimeout();
} else if (buttonEvent.button == 3) { } else if (buttonEvent.button == 3) {
this.popupMenu(); this.popupMenu();
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} }
return Clutter.EVENT_PROPAGATE; return ret;
} }
vfunc_touch_event(touchEvent) { vfunc_touch_event(touchEvent) {
super.vfunc_touch_event(touchEvent); const ret = super.vfunc_touch_event(touchEvent);
if (touchEvent.type == Clutter.EventType.TOUCH_BEGIN) if (touchEvent.type == Clutter.EventType.TOUCH_BEGIN)
this._setPopupTimeout(); this._setPopupTimeout();
return Clutter.EVENT_PROPAGATE; return ret;
} }
vfunc_clicked(button) { vfunc_clicked(button) {