Fix: Footer hides text (#3056)

This patch should resolve issue #2257 (Footer hides text)
Sometimes, depending on an epub style, some text is hidden by the progress bar (the mini one at the bottom).
This commit is contained in:
Robert
2017-08-08 19:06:11 +02:00
committed by Frans de Jonge
parent 64529b5391
commit 1bfad22af0
4 changed files with 32 additions and 12 deletions

View File

@@ -16,7 +16,6 @@ local util = require("util")
local _ = require("gettext")
local Screen = Device.screen
local MODE = {
off = 0,
page_progress = 1,
@@ -195,13 +194,17 @@ function ReaderFooter:init()
self[1] = self.footer_positioner
self.mode = G_reader_settings:readSetting("reader_footer_mode") or self.mode
if self.has_no_mode then
self.mode = MODE.off
self.view.footer_visible = false
self:resetLayout()
end
if self.settings.all_at_once then
self.view.footer_visible = (self.mode ~= MODE.off)
self:updateFooterTextGenerator()
else
self:applyFooterMode()
end
if self.settings.auto_refresh_time then
self:setupAutoRefreshTime()
end
@@ -369,6 +372,15 @@ function ReaderFooter:addToMainMenu(menu_items)
break
end
end
-- refresh margins position
if self.has_no_mode then
self.ui:handleEvent(Event:new("SetPageMargins", self.view.document.configurable.page_margins))
self.genFooterText = footerTextGeneratorMap.empty
self.mode = MODE.off
elseif prev_has_no_mode then
self.ui:handleEvent(Event:new("SetPageMargins", self.view.document.configurable.page_margins))
G_reader_settings:saveSetting("reader_footer_mode", first_enabled_mode_num)
end
if callback then
should_update = callback(self)
elseif self.settings.all_at_once then
@@ -603,6 +615,9 @@ function ReaderFooter:onExitFlippingMode()
end
function ReaderFooter:onTapFooter(ges)
if self.has_no_mode then
return
end
if self.view.flipping_visible then
local pos = ges.pos
local dimen = self.progress_bar.dimen