From f450936e9a616c77f6a32c0ce7af1f64f268730e Mon Sep 17 00:00:00 2001
From: Robert <robert.styla@gmail.com>
Date: Thu, 8 Aug 2019 15:19:09 +0200
Subject: [PATCH] Fix: conflict horizontal edge gesture with link swipe (#5189)

See: #5186
---
 .../apps/reader/modules/readergesture.lua     |  9 +++
 frontend/apps/reader/modules/readerlink.lua   | 65 ++++++++-----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/frontend/apps/reader/modules/readergesture.lua b/frontend/apps/reader/modules/readergesture.lua
index cdf62b411..3cfd9eeed 100644
--- a/frontend/apps/reader/modules/readergesture.lua
+++ b/frontend/apps/reader/modules/readergesture.lua
@@ -952,6 +952,15 @@ function ReaderGesture:setupGesture(ges, action)
         overrides_vertical_edge = {
             "paging_swipe",
             "rolling_swipe",
+            "readermenu_swipe",
+            "readerconfigmenu_swipe",
+        }
+        overrides_horizontal_edge = {
+            "swipe_link",
+            "paging_swipe",
+            "rolling_swipe",
+            "readermenu_swipe",
+            "readerconfigmenu_swipe",
         }
         overrides_pan = {
             "paging_swipe",
diff --git a/frontend/apps/reader/modules/readerlink.lua b/frontend/apps/reader/modules/readerlink.lua
index 97113d673..5b76acb3d 100644
--- a/frontend/apps/reader/modules/readerlink.lua
+++ b/frontend/apps/reader/modules/readerlink.lua
@@ -6,8 +6,6 @@ local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
 local ConfirmBox = require("ui/widget/confirmbox")
 local Device = require("device")
 local Event = require("ui/event")
-local Geom = require("ui/geometry")
-local GestureRange = require("ui/gesturerange")
 local InfoMessage = require("ui/widget/infomessage")
 local InputContainer = require("ui/widget/container/inputcontainer")
 local LinkBox = require("ui/widget/linkbox")
@@ -26,7 +24,34 @@ local ReaderLink = InputContainer:new{
 
 function ReaderLink:init()
     if Device:isTouchDevice() then
-        self:initGesListener()
+        self.ui:registerTouchZones({
+            {
+                id = "tap_link",
+                ges = "tap",
+                screen_zone = {
+                    ratio_x = 0, ratio_y = 0,
+                    ratio_w = 1, ratio_h = 1,
+                },
+                overrides = {
+                    "tap_forward",
+                    "tap_backward",
+                },
+                handler = function(ges) return self:onTap(_, ges) end,
+            },
+            {
+                id = "swipe_link",
+                ges = "swipe",
+                screen_zone = {
+                    ratio_x = 0, ratio_y = 0,
+                    ratio_w = 1, ratio_h = 1,
+                },
+                overrides = {
+                    "paging_swipe",
+                    "rolling_swipe"
+                },
+                handler = function(ges) return self:onSwipe(_, ges) end,
+            },
+        })
     end
     self.ui:registerPostInitCallback(function()
         self.ui.menu:registerToMainMenu(self)
@@ -48,33 +73,6 @@ function ReaderLink:onReadSettings(config)
     self.location_stack = {}
 end
 
-function ReaderLink:initGesListener()
-    if Device:isTouchDevice() then
-        self.ges_events = {
-            Tap = {
-                GestureRange:new{
-                    ges = "tap",
-                    range = Geom:new{
-                        x = 0, y = 0,
-                        w = Screen:getWidth(),
-                        h = Screen:getHeight()
-                    }
-                }
-            },
-            Swipe = {
-                GestureRange:new{
-                    ges = "swipe",
-                    range = Geom:new{
-                        x = 0, y = 0,
-                        w = Screen:getWidth(),
-                        h = Screen:getHeight(),
-                    }
-                }
-            },
-        }
-    end
-end
-
 local function isTapToFollowLinksOn()
     return G_reader_settings:nilOrTrue("tap_to_follow_links")
 end
@@ -375,13 +373,6 @@ function ReaderLink:showLinkBox(link, allow_footnote_popup)
     end
 end
 
-function ReaderLink:onSetDimensions(dimen)
-    -- update listening according to new screen dimen
-    if Device:isTouchDevice() then
-        self:initGesListener()
-    end
-end
-
 function ReaderLink:onTap(_, ges)
     if not isTapToFollowLinksOn() then return end
     if self.ui.document.info.has_pages then