From b076ca1c298645f88a37c3fac3e32b784b162d42 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sun, 2 Apr 2017 12:42:25 +0200 Subject: [PATCH] ReaderFooter: fix quick browsing by tapping footer in flipping mode Fixes #2649. --- frontend/apps/reader/modules/readerfooter.lua | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua index c1690898f..9f44a3d2b 100644 --- a/frontend/apps/reader/modules/readerfooter.lua +++ b/frontend/apps/reader/modules/readerfooter.lua @@ -1,20 +1,20 @@ -local WidgetContainer = require("ui/widget/container/widgetcontainer") -local RightContainer = require("ui/widget/container/rightcontainer") +local Blitbuffer = require("ffi/blitbuffer") local BottomContainer = require("ui/widget/container/bottomcontainer") +local Device = require("device") +local Event = require("ui/event") +local Font = require("ui/font") local FrameContainer = require("ui/widget/container/framecontainer") -local ProgressWidget = require("ui/widget/progresswidget") +local Geom = require("ui/geometry") local HorizontalGroup = require("ui/widget/horizontalgroup") local HorizontalSpan = require("ui/widget/horizontalspan") +local ProgressWidget = require("ui/widget/progresswidget") +local RightContainer = require("ui/widget/container/rightcontainer") local TextWidget = require("ui/widget/textwidget") -local Blitbuffer = require("ffi/blitbuffer") local UIManager = require("ui/uimanager") -local Device = require("device") -local Screen = require("device").screen -local Geom = require("ui/geometry") -local Event = require("ui/event") -local Font = require("ui/font") +local WidgetContainer = require("ui/widget/container/widgetcontainer") +local util = require("util") local _ = require("gettext") -local util = require("util") +local Screen = Device.screen local MODE = { @@ -230,7 +230,7 @@ function ReaderFooter:setupTouchZones() id = "readerfooter_tap", ges = "tap", screen_zone = footer_screen_zone, - handler = function() return self:onTapFooter() end, + handler = function(ges) return self:onTapFooter(ges) end, overrides = { 'tap_forward', 'tap_backward', -- NOTE: readermenu_tap override is needed to keep behavior @@ -570,7 +570,7 @@ function ReaderFooter:onExitFlippingMode() self:applyFooterMode(self.orig_mode) end -function ReaderFooter:onTapFooter(arg, ges) +function ReaderFooter:onTapFooter(ges) if self.view.flipping_visible then local pos = ges.pos local dimen = self.progress_bar.dimen