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
This commit is contained in:
parent
2909d91c13
commit
2a9ccf2e2c
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user