[gnome-shell/T29763: 218/249] appDisplay: Use parent class result for button-press/touch-event vfuncs if not handled
- From: Matthew Leeds <mwleeds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/T29763: 218/249] appDisplay: Use parent class result for button-press/touch-event vfuncs if not handled
- Date: Thu, 21 May 2020 18:27:32 +0000 (UTC)
commit cd7fe7925a23055eae181e2b32ed19f83d1d172f
Author: Andre Moreira Magalhaes <andre endlessm com>
Date: Thu Apr 16 00:22:47 2020 -0300
appDisplay: Use parent class result for button-press/touch-event vfuncs if not handled
This fixes an issue where the background action long-press callback was
invoked for app icons as the event was getting propagated.
https://phabricator.endlessm.com/T29781
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 595b1b639e..0778b904f0 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -2130,22 +2130,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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]