renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Floor dimension computations (mul/div). (#6264)

Browse Source 
* floor most every dimension computations involving MUL or DIV
Should avoid passing nonsensical floating point coordinates/dimensions
to the UI code.

* Update base

* https://github.com/koreader/koreader-base/pull/1113
* https://github.com/koreader/koreader-base/pull/1114
* https://github.com/koreader/koreader-base/pull/1115

* Bump android-luajit-launcher

https://github.com/koreader/android-luajit-launcher/pull/230
https://github.com/koreader/android-luajit-launcher/pull/231
This commit is contained in:
NiLuJe
2020-06-13 01:56:36 +02:00
committed by GitHub
parent 19b15462b2
commit 1f994f8ede
57 changed files with 178 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/statistics.koplugin/readerprogress.lua
View File

@@ -47,7 +47,7 @@ function ReaderProgress:init()
self.large_font_face = Font:getFace("largeffont")
self.screen_width = Screen:getWidth()
self.screen_height = Screen:getHeight()
if Screen:getWidth() < Screen:getHeight() then
if self.screen_width < self.screen_height then
self.header_span = 25
self.stats_span = 20
else
@@ -256,7 +256,7 @@ function ReaderProgress:genWeekStats(stats_day)
LeftContainer:new{
dimen = Geom:new{ w = self.screen_width , h = height / 3 },
ProgressWidget:new{
width = (self.screen_width * 0.005) + (self.screen_width * 0.9 * select_day_time / max_week_time),
width = math.floor((self.screen_width * 0.005) + (self.screen_width * 0.9 * select_day_time / max_week_time)),
height = Screen:scaleBySize(14),
percentage = 1.0,
ticks = nil,
@@ -272,7 +272,7 @@ function ReaderProgress:genWeekStats(stats_day)
end --for i=1
table.insert(statistics_container, statistics_group)
return CenterContainer:new{
dimen = Geom:new{ w = self.screen_width * 1.1 , h = self.screen_height * 0.50 },
dimen = Geom:new{ w = math.floor(self.screen_width * 1.1), h = math.floor(self.screen_height * 0.5) },
statistics_container,
}
end
@@ -365,7 +365,7 @@ function ReaderProgress:genSummaryDay(width)
table.insert(statistics_group, span_group)
table.insert(statistics_container, statistics_group)
return CenterContainer:new{
dimen = Geom:new{ w = self.screen_width , h = self.screen_height * 0.13 },
dimen = Geom:new{ w = self.screen_width , h = math.floor(self.screen_height * 0.13) },
statistics_container,
}
end
@@ -490,7 +490,7 @@ function ReaderProgress:genSummaryWeek(width)
table.insert(statistics_group, data_group)
table.insert(statistics_container, statistics_group)
return CenterContainer:new{
dimen = Geom:new{ w = self.screen_width , h = self.screen_height * 0.10 },
dimen = Geom:new{ w = self.screen_width , h = math.floor(self.screen_height * 0.10) },
statistics_container,
}
end