Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Incorrect width of separator line (#5403)

Browse Source 
Fix: #5399
This commit is contained in:
Robert 2019-09-19 11:51:55 +02:00 committed by Frans de Jonge
parent 6a2e4b7a08
commit 8c1610b4e9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/apps/reader/modules/readerfooter.lua
View File

@ -319,15 +319,15 @@ function ReaderFooter:updateFooterContainer()
end end
if self.settings.bottom_horizontal_separator then if self.settings.bottom_horizontal_separator then
local separator_line = LineWidget:new{ self.separator_line = LineWidget:new{
dimen = Geom:new{ dimen = Geom:new{
w = Screen:getWidth() - 2 * self.horizontal_margin, w = 0,
h = Size.line.medium, h = Size.line.medium,
} }
} }
local vertical_span = VerticalSpan:new{width = self.bottom_padding *2} local vertical_span = VerticalSpan:new{width = self.bottom_padding *2}
self.vertical_frame = VerticalGroup:new{ self.vertical_frame = VerticalGroup:new{
separator_line, self.separator_line,
vertical_span, vertical_span,
self.footer_container, self.footer_container,
} }
@ -408,6 +408,9 @@ function ReaderFooter:resetLayout(force_reset)
self.progress_bar.width = math.floor( self.progress_bar.width = math.floor(
new_screen_width - self.text_width - self.horizontal_margin*2) new_screen_width - self.text_width - self.horizontal_margin*2)
end end
if self.separator_line then
self.separator_line.dimen.w = new_screen_width - 2 * self.horizontal_margin
end
self.horizontal_group:resetLayout() self.horizontal_group:resetLayout()
self.footer_positioner.dimen.w = new_screen_width self.footer_positioner.dimen.w = new_screen_width
self.footer_positioner.dimen.h = new_screen_height self.footer_positioner.dimen.h = new_screen_height
@ -1059,6 +1062,9 @@ function ReaderFooter:_updateFooterText(force_repaint)
self.progress_bar.width = math.floor( self.progress_bar.width = math.floor(
self._saved_screen_width - self.text_width - self.horizontal_margin*2) self._saved_screen_width - self.text_width - self.horizontal_margin*2)
end end
if self.separator_line then
self.separator_line.dimen.w = self._saved_screen_width - 2 * self.horizontal_margin
end
self.text_container.dimen.w = self.text_width self.text_container.dimen.w = self.text_width
self.horizontal_group:resetLayout() self.horizontal_group:resetLayout()
-- NOTE: This is essentially preventing us from truly using "fast" for panning, -- NOTE: This is essentially preventing us from truly using "fast" for panning,