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

16
frontend/ui/widget/datewidget.lua
View File

@@ -37,7 +37,7 @@ function DateWidget:init()
self.light_bar = {}
self.screen_width = Screen:getWidth()
self.screen_height = Screen:getHeight()
self.width = self.screen_width * 0.95
self.width = math.floor(self.screen_width * 0.95)
if Device:hasKeys() then
self.key_events = {
Close = { {"Back"}, doc = "close date widget" }
@@ -62,7 +62,7 @@ end
function DateWidget:update()
local year_widget = NumberPickerWidget:new{
show_parent = self,
width = self.screen_width * 0.2,
width = math.floor(self.screen_width * 0.2),
value = self.year,
value_min = 2017,
value_max = 2037,
@@ -71,7 +71,7 @@ function DateWidget:update()
}
local month_widget = NumberPickerWidget:new{
show_parent = self,
width = self.screen_width * 0.2,
width = math.floor(self.screen_width * 0.2),
value = self.month,
value_min = 1,
value_max = 12,
@@ -80,7 +80,7 @@ function DateWidget:update()
}
local day_widget = NumberPickerWidget:new{
show_parent = self,
width = self.screen_width * 0.2,
width = math.floor(self.screen_width * 0.2),
value = self.day,
value_min = 1,
value_max = 31,
@@ -94,7 +94,7 @@ function DateWidget:update()
alignment = "center",
face = self.title_face,
bold = true,
width = self.screen_width * 0.1,
width = math.floor(self.screen_width * 0.1),
}
local date_group = HorizontalGroup:new{
align = "center",
@@ -113,7 +113,7 @@ function DateWidget:update()
text = self.title_text,
face = self.title_face,
bold = true,
width = self.screen_width * 0.95,
width = math.floor(self.screen_width * 0.95),
},
}
local date_line = LineWidget:new{
@@ -172,8 +172,8 @@ function DateWidget:update()
date_line,
CenterContainer:new{
dimen = Geom:new{
w = self.screen_width * 0.95,
h = date_group:getSize().h * 1.2,
w = math.floor(self.screen_width * 0.95),
h = math.floor(date_group:getSize().h * 1.2),
},
date_group
},