mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Merge pull request #1888 from koreader/houqp-master
minor bookstatus fix for nexus5x
This commit is contained in:
2
base
2
base
Submodule base updated: 21066ecb73...8cdf526854
@@ -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
|
||||
|
||||
|
||||
2
kodev
2
kodev
@@ -336,7 +336,7 @@ TARGET:
|
||||
exit 0
|
||||
;;
|
||||
android)
|
||||
adb logcat 'luajit-launcher:D *:S'
|
||||
adb logcat 'luajit-launcher:D KOReader:D *:S'
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported target: $1."
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
local A = require("android")
|
||||
A.dl.library_path = A.dl.library_path .. ":" .. A.dir .. "/libs"
|
||||
A.log_name = 'KOReader'
|
||||
|
||||
local ffi = require("ffi")
|
||||
ffi.cdef[[
|
||||
|
||||
Reference in New Issue
Block a user