From 44529dbbc9e62d19f71224c399892f86228874d3 Mon Sep 17 00:00:00 2001 From: poire-z Date: Sat, 30 Mar 2019 19:29:37 +0100 Subject: [PATCH] Fix tap for top menu occasionally not working It was missing some ordering hints to have it always precede taps to change page. (Somehow noticed only when we reached > 32 gestures registered, which may have introduced some shuffling, while previously the addition order was somehow preserved...) --- frontend/apps/reader/modules/readergesture.lua | 4 ++-- frontend/apps/reader/modules/readermenu.lua | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/apps/reader/modules/readergesture.lua b/frontend/apps/reader/modules/readergesture.lua index c5e2383a4..1b75002f6 100644 --- a/frontend/apps/reader/modules/readergesture.lua +++ b/frontend/apps/reader/modules/readergesture.lua @@ -589,7 +589,7 @@ function ReaderGesture:setupGesture(ges, action) if self.is_docless then overrides = { 'filemanager_tap' } else - overrides = { 'readerfooter_tap', } + overrides = { 'readerfooter_tap' } end elseif ges == "tap_left_bottom_corner" then ges_type = "tap" @@ -600,7 +600,7 @@ function ReaderGesture:setupGesture(ges, action) if self.is_docless then overrides = { 'filemanager_tap' } else - overrides = { 'readerfooter_tap', 'filemanager_tap' } + overrides = { 'readerfooter_tap' } end elseif ges == "two_finger_swipe_west" then ges_type = "two_finger_swipe" diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index 6f6021344..4ffff08c0 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -97,6 +97,7 @@ function ReaderMenu:onReaderReady() 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 = { 'tap_forward', 'tap_backward', }, handler = function(ges) return self:onTapShowMenu(ges) end, }, {