From ecd391c9ac418cb63e54fb62ee9549d8858da08f Mon Sep 17 00:00:00 2001
From: Anthony Tseng <darkdh@gmail.com>
Date: Sun, 26 Mar 2017 00:28:38 -0700
Subject: [PATCH] Solve horizontal swipe conflict by left/right edge
 Temporarily add system preference swipe setting back until we complete
 appState migration

fix #7100, #3299

Auditors: @bsclifton, @bbondy

Test Plan:
For swipe conflict
1. Navigate to some sites and make sure you have back/forward history
2. Open dev panel by shift + f8 to make webview smaller
3. Go to https://github.com/brave/browser-laptop/projects/1
4. Swipe left/back should not trigger navigation until reaching the edge

For swipe setting
1. Navigate to some sites and make sure you have back/forward history
2. Turn off "Swipe between edges" in system setting
3. There should be any navigations by edge swiping
4. Turn on "Swipe between edges" in systme setting
5. There will be navigation by edge swiping
---
 js/components/main.js | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/js/components/main.js b/js/components/main.js
index 559720e2964..d9fe92eed16 100644
--- a/js/components/main.js
+++ b/js/components/main.js
@@ -8,7 +8,7 @@ const Immutable = require('immutable')
 const electron = require('electron')
 const {StyleSheet, css} = require('aphrodite')
 const ipc = electron.ipcRenderer
-// const systemPreferences = electron.remote.systemPreferences
+const systemPreferences = electron.remote.systemPreferences
 
 // Actions
 const appActions = require('../actions/appActions')
@@ -233,7 +233,8 @@ class Main extends ImmutableComponent {
     // Navigates back/forward on macOS two-finger swipe
     var trackingFingers = false
     var swipeGesture = false
-    var isSwipeOnEdge = false
+    var isSwipeOnLeftEdge = false
+    var isSwipeOnRightEdge = false
     var deltaX = 0
     var deltaY = 0
     var startTime = 0
@@ -279,19 +280,17 @@ class Main extends ImmutableComponent {
       swipeGesture = false
     })
     ipc.on('scroll-touch-begin', function () {
-      if (swipeGesture) {
-        // TODO(Anthony): respecting system settings on cr54
-        // systemPreferences.isSwipeTrackingFromScrollEventsEnabled()) {
+      if (swipeGesture &&
+        systemPreferences.isSwipeTrackingFromScrollEventsEnabled()) {
         trackingFingers = true
-        isSwipeOnEdge = false
         startTime = (new Date()).getTime()
       }
     })
     ipc.on('scroll-touch-end', function () {
-      if (time > 50 && trackingFingers && Math.abs(deltaY) < 50 && isSwipeOnEdge) {
-        if (deltaX > 70) {
+      if (time > 50 && trackingFingers && Math.abs(deltaY) < 50) {
+        if (deltaX > 70 && isSwipeOnRightEdge) {
           ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_FORWARD)
-        } else if (deltaX < -70) {
+        } else if (deltaX < -70 && isSwipeOnLeftEdge) {
           ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_BACK)
         }
       }
@@ -301,7 +300,17 @@ class Main extends ImmutableComponent {
       startTime = 0
     })
     ipc.on('scroll-touch-edge', function () {
-      isSwipeOnEdge = true
+      if (deltaX > 0 && !isSwipeOnRightEdge) {
+        isSwipeOnRightEdge = true
+        isSwipeOnLeftEdge = false
+        time = 0
+        deltaX = 0
+      } else if (deltaX < 0 && !isSwipeOnLeftEdge) {
+        isSwipeOnLeftEdge = true
+        isSwipeOnRightEdge = false
+        time = 0
+        deltaX = 0
+      }
     })
     ipc.on(messages.LEAVE_FULL_SCREEN, this.exitFullScreen.bind(this))
   }