From e9a56243731bc469eb3ecd259a149e7c120c36b0 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 13 Mar 2016 19:48:28 -0700 Subject: [PATCH] fix(bookstatus): enforce status page height to screen height --- frontend/ui/widget/bookstatuswidget.lua | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/frontend/ui/widget/bookstatuswidget.lua b/frontend/ui/widget/bookstatuswidget.lua index 795db202a..4e829429a 100644 --- a/frontend/ui/widget/bookstatuswidget.lua +++ b/frontend/ui/widget/bookstatuswidget.lua @@ -76,32 +76,31 @@ function BookStatusWidget:init() enabled = true, show_parent = self, } - - local statusContainer = FrameContainer:new{ - dimen = Screen:getSize(), + local screen_size = Screen:getSize() + self[1] = FrameContainer:new{ + width = screen_size.w, + height = screen_size.h, background = Blitbuffer.COLOR_WHITE, bordersize = 0, padding = 0, - self:showStatus(), + self:getStatusContent(screen_size.w), } - self[1] = statusContainer end -function BookStatusWidget:showStatus() - local screen_width = Screen:getWidth() +function BookStatusWidget:getStatusContent(width) return VerticalGroup:new{ align = "left", OverlapGroup:new{ - dimen = Geom:new{ w = screen_width, h = Screen:scaleBySize(30) }, + dimen = Geom:new{ w = width, h = Screen:scaleBySize(30) }, CloseButton:new{ window = self }, }, self:genBookInfoGroup(), self:genHeader(_("Statistics")), - self:genStatisticsGroup(screen_width), + self:genStatisticsGroup(width), self:genHeader(_("Review")), - self:genSummaryGroup(screen_width), + self:genSummaryGroup(width), self:genHeader(_("Update Status")), - self:generateSwitchGroup(screen_width), + self:generateSwitchGroup(width), } end