Apply changes to brave/muon#33

fix brave#2400
darkdh · Aug 4, 2016 · 208fcf8 · 208fcf8
1 parent dc44032
commit 208fcf8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/js/components/main.js b/js/components/main.js
@@ -7,6 +7,7 @@ const ImmutableComponent = require('./immutableComponent')
 const Immutable = require('immutable')
 const electron = global.require('electron')
 const ipc = electron.ipcRenderer
+const systemPreferences = electron.remote.systemPreferences
 
 // Actions
 const windowActions = require('../actions/windowActions')
@@ -179,7 +180,8 @@ class Main extends ImmutableComponent {
       swipeGesture = false
     })
     ipc.on('scroll-touch-begin', function () {
-      if (swipeGesture) {
+      if (swipeGesture &&
+        systemPreferences.isSwipeTrackingFromScrollEventsEnabled()) {
         trackingFingers = true
         startTime = (new Date()).getTime()
       }