From 2980515c857e8ebbd4607104e0620d856892337e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 4 Sep 2013 13:54:53 +0200 Subject: [PATCH] appDisplay: Fix return value for _onScroll ClutterActor::scroll-event has a boolean return value to indicate whether the event has been handled, or event emission should continue. Now that we are using an StScrollView, we depend on this to avoid propagating the event to the view's own handler. https://bugzilla.gnome.org/show_bug.cgi?id=707409 --- js/ui/appDisplay.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index 70b63efe0..ece06a56d 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -401,8 +401,8 @@ const AllView = new Lang.Class({ }, _onScroll: function(actor, event) { - if(this._displayingPopup) - return; + if (this._displayingPopup) + return true; let direction = event.get_scroll_direction(); if (direction == Clutter.ScrollDirection.UP) { if (this._currentPage > 0) @@ -413,6 +413,7 @@ const AllView = new Lang.Class({ this.goToPage(this._currentPage + 1); } } + return true; }, _onPan: function(action) {