Prevent two-finger swipe forard/back when scrolling

fix brave#2548
darkdh · Jul 18, 2016 · ddff3ff · ddff3ff
1 parent 60c5314
commit ddff3ff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/app/extensions/brave/content/scripts/inputHandler.js b/app/extensions/brave/content/scripts/inputHandler.js
@@ -156,3 +156,7 @@ document.addEventListener('keydown', (e /*: Event*/) => {
       break
   }
 })
+
+document.addEventListener('scroll', (e) => {
+  chrome.ipc.sendToHost('got-scroll')
+})
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -505,6 +505,9 @@ class Frame extends ImmutableComponent {
         case messages.GO_FORWARD:
           method = () => this.webview.goForward()
           break
+        case messages.GOT_SCROLL:
+          remote.getCurrentWindow().webContents.send(messages.GOT_SCROLL)
+          break
         case messages.NEW_FRAME:
           method = (frameOpts, openInForeground) => {
             windowActions.newFrame(frameOpts, openInForeground)

diff --git a/js/components/main.js b/js/components/main.js
@@ -110,6 +110,7 @@ class Main extends ImmutableComponent {
   registerSwipeListener () {
     // Navigates back/forward on macOS two-finger swipe
     var trackingFingers = false
+    var isScroll = false
     var deltaX = 0
     var deltaY = 0
     var startTime = 0
@@ -125,12 +126,15 @@ class Main extends ImmutableComponent {
         yVelocity = deltaY / time
       }
     })
+    ipc.on(messages.GOT_SCROLL, (e) => {
+      isScroll = true
+    })
     ipc.on('scroll-touch-begin', function () {
       trackingFingers = true
       startTime = (new Date()).getTime()
     })
     ipc.on('scroll-touch-end', function () {
-      if (trackingFingers && Math.abs(yVelocity) < 1) {
+      if (!isScroll && trackingFingers && Math.abs(yVelocity) < 1) {
         if (xVelocity > 1.5) {
           ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_FORWARD)
         } else if (xVelocity < -1.5) {
@@ -141,6 +145,7 @@ class Main extends ImmutableComponent {
       deltaX = 0
       deltaY = 0
       startTime = 0
+      isScroll = false
     })
     ipc.on(messages.LEAVE_FULL_SCREEN, this.exitFullScreen.bind(this))
   }

diff --git a/js/constants/messages.js b/js/constants/messages.js
@@ -74,6 +74,7 @@ const messages = {
   SET_RESOURCE_ENABLED: _,
   GO_BACK: _,
   GO_FORWARD: _,
+  GOT_SCROLL: _,
   GOT_PDFJS_URL: _, /** @arg {string} origin - of PDFJS extension */
   // Password manager
   GET_PASSWORDS: _, /** @arg {string} formOrigin, @arg {string} action */