[gnome-shell/wip/exalm/gestures: 5/6] x11

[Alexander Mikhaylenko <alexm src gnome org>]

commit 991c261db1e69c1bcc05bf834e82a1606cd4cbb0
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Fri Jun 28 20:31:15 2019 +0500

    x11

 js/ui/swipeTracker.js   | 2 +-
 js/ui/workspacesView.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/swipeTracker.js b/js/ui/swipeTracker.js
index 0c764f81a..224d3a82a 100644
--- a/js/ui/swipeTracker.js
+++ b/js/ui/swipeTracker.js
@@ -122,7 +122,7 @@ var ScrollGesture = class ScrollGesture {
         if (event.get_scroll_direction() != Clutter.ScrollDirection.SMOOTH)
             return Clutter.EVENT_PROPAGATE;
 
-        if (event.get_scroll_source() != Clutter.ScrollSource.FINGER)
+        if (event.get_scroll_source() != Clutter.ScrollSource.FINGER && 
event.get_source_device().get_device_type() != Clutter.InputDeviceType.TOUCHPAD_DEVICE)
             return Clutter.EVENT_PROPAGATE;
 
         if (this._shouldSkip())
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index a8f2cb68f..530581e3e 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -737,7 +737,7 @@ var WorkspacesDisplay = class {
     }
 
     _onScrollEvent(actor, event) {
-        if (event.get_scroll_source() == Clutter.ScrollSource.FINGER) // TODO: remove this and handle it in 
SwipeTracker too
+        if (event.get_scroll_source() == Clutter.ScrollSource.FINGER || 
event.get_source_device().get_device_type() == Clutter.InputDeviceType.TOUCHPAD_DEVICE) // TODO: remove this 
and handle it in SwipeTracker too
             return Clutter.EVENT_PROPAGATE;
 
         if (!this.actor.mapped)