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

[fix, UX] timewidget and datewidget in landscape mode (#3666)

Browse Source
This commit is contained in:
Robert
2018-02-07 18:45:46 +01:00
committed by Frans de Jonge
parent af694a3d89
commit 04b49a7c80
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,12 +40,12 @@ function DateWidget:init()
self.width = self.screen_width * 0.95
if Device:hasKeys() then
self.key_events = {
Close = { {"Back"}, doc = "close date" }
Close = { {"Back"}, doc = "close date widget" }
}
end
if Device:isTouchDevice() then
self.ges_events = {
TapCloseFL = {
TapClose = {
GestureRange:new{
ges = "tap",
range = Geom:new{
@@ -173,7 +173,7 @@ function DateWidget:update()
CenterContainer:new{
dimen = Geom:new{
w = self.screen_width * 0.95,
h = self.screen_height * 0.25,
h = date_group:getSize().h * 1.2,
},
date_group
},
@@ -188,7 +188,7 @@ function DateWidget:update()
}
self[1] = WidgetContainer:new{
align = "center",
dimen =Geom:new{
dimen = Geom:new{
x = 0, y = 0,
w = self.screen_width,
h = self.screen_height,
@@ -223,7 +223,7 @@ function DateWidget:onAnyKeyPressed()
return true
end
function DateWidget:onTapCloseFL(arg, ges_ev)
function DateWidget:onTapClose(arg, ges_ev)
if ges_ev.pos:notIntersectWith(self.date_frame.dimen) then
self:onClose()
end

10
frontend/ui/widget/timewidget.lua
View File

@@ -40,12 +40,12 @@ function TimeWidget:init()
self.width = self.screen_width * 0.95
if Device:hasKeys() then
self.key_events = {
Close = { {"Back"}, doc = "close time" }
Close = { {"Back"}, doc = "close time widget" }
}
end
if Device:isTouchDevice() then
self.ges_events = {
TapCloseFL = {
TapClose = {
GestureRange:new{
ges = "tap",
range = Geom:new{
@@ -158,7 +158,7 @@ function TimeWidget:update()
CenterContainer:new{
dimen = Geom:new{
w = self.screen_width * 0.95,
h = self.screen_height * 0.25,
h = time_group:getSize().h * 1.2,
},
time_group
},
@@ -173,7 +173,7 @@ function TimeWidget:update()
}
self[1] = WidgetContainer:new{
align = "center",
dimen =Geom:new{
dimen = Geom:new{
x = 0, y = 0,
w = self.screen_width,
h = self.screen_height,
@@ -207,7 +207,7 @@ function TimeWidget:onAnyKeyPressed()
return true
end
function TimeWidget:onTapCloseFL(arg, ges_ev)
function TimeWidget:onTapClose(arg, ges_ev)
if ges_ev.pos:notIntersectWith(self.time_frame.dimen) then
self:onClose()
end