From 04b49a7c80fca2c9a798e69d5c81bdddf0509560 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 7 Feb 2018 18:45:46 +0100 Subject: [PATCH] [fix, UX] timewidget and datewidget in landscape mode (#3666) --- frontend/ui/widget/datewidget.lua | 10 +++++----- frontend/ui/widget/timewidget.lua | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/ui/widget/datewidget.lua b/frontend/ui/widget/datewidget.lua index b9e5665d4..58c95cd04 100644 --- a/frontend/ui/widget/datewidget.lua +++ b/frontend/ui/widget/datewidget.lua @@ -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 diff --git a/frontend/ui/widget/timewidget.lua b/frontend/ui/widget/timewidget.lua index 9314fef9c..8495e0f93 100644 --- a/frontend/ui/widget/timewidget.lua +++ b/frontend/ui/widget/timewidget.lua @@ -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