From 55ec64a859a9867bb821f92de088f04dc1a36411 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 23 Apr 2017 23:33:12 -0700
Subject: [PATCH] readermenu(fix): override pan gesture from scrolling

---
 defaults.lua                                |  2 +-
 frontend/apps/reader/modules/readermenu.lua | 10 ++++++++++
 spec/unit/defaults_spec.lua                 |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/defaults.lua b/defaults.lua
index 2ee54f775..b83c7c91d 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -68,7 +68,7 @@ FOLLOW_LINK_TIMEOUT = 0.5
 -- y: y coordinate of top left corner in proportion of screen height
 -- w: width of tap zone in proportion of screen width
 -- h: height of tap zone in proportion of screen height
-DTAP_ZONE_MENU = {x = 1/8, y = 0, w = 3/4, h = 1/4}
+DTAP_ZONE_MENU = {x = 1/8, y = 0, w = 3/4, h = 1/8}
 DTAP_ZONE_CONFIG = {x = 0, y = 0, w = 0, h = 0}
 DTAP_ZONE_MINIBAR = {x = 0, y = 15/16, w = 1, h = 1/16}
 DTAP_ZONE_FORWARD = {x = 1/4, y = 0, w = 3/4, h = 1}
diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua
index 3a927faab..aad7f5e2d 100644
--- a/frontend/apps/reader/modules/readermenu.lua
+++ b/frontend/apps/reader/modules/readermenu.lua
@@ -93,6 +93,16 @@ function ReaderMenu:onReaderReady()
             overrides = { "rolling_swipe", "paging_swipe", },
             handler = function(ges) return self:onSwipeShowMenu(ges) end,
         },
+        {
+            id = "readermenu_pan",
+            ges = "pan",
+            screen_zone = {
+                ratio_x = DTAP_ZONE_MENU.x, ratio_y = DTAP_ZONE_MENU.y,
+                ratio_w = DTAP_ZONE_MENU.w, ratio_h = DTAP_ZONE_MENU.h,
+            },
+            overrides = { "rolling_pan", "paging_pan", },
+            handler = function(ges) return self:onSwipeShowMenu(ges) end,
+        },
     })
 end
 
diff --git a/spec/unit/defaults_spec.lua b/spec/unit/defaults_spec.lua
index 1d3f0b3dc..c426f18c9 100644
--- a/spec/unit/defaults_spec.lua
+++ b/spec/unit/defaults_spec.lua
@@ -45,7 +45,7 @@ DHINTCOUNT = 1
 DTAP_ZONE_MENU = {
     ["y"] = 0,
     ["x"] = 0.125,
-    ["h"] = 0.25,
+    ["h"] = 0.125,
     ["w"] = 0.75
 }
 ]],