mirror of
https://github.com/koreader/koreader
synced 2024-11-16 06:12:56 +00:00
df0bbc9db7
* QuickDictLookup, ImageViewer, NumberPicker: Smarter `update` that will re-use most of the widget's layout instead of re-instantiating all the things. * SpinWidget/DoubleSpinWidget: The NumberPicker change above renders a hack to preserve alpha on these widgets almost unnecessary. Also fixed said hack to also apply to the center, value button. * Button: Don't re-instantiate the frame in setText/setIcon when unnecessary (e.g., no change at all, or no layout change). * Button: Add a refresh method that repaints and refreshes a *specific* Button (provided it's been painted once) all on its lonesome. * ConfigDialog: Free everything that's going to be re-instatiated on update * A few more post #7118 fixes: * SkimTo: Always flag the chapter nav buttons as vsync * Button: Fix the highlight on rounded buttons when vsync is enabled (e.g., it's now entirely visible, instead of showing a weird inverted corner glitch). * Some more heuristic tweaks in Menu/TouchMenu/Button/IconButton * ButtonTable: fix the annoying rounding issue I'd noticed in #7054 ;). * Enable dithering in TextBoxWidget (e.g., in the Wikipedia full view). This involved moving the HW dithering align fixup to base, where it always ought to have been ;). * Switch a few widgets that were using "partial" on close to "ui", or, more rarely, "flashui". The intent being to limit "partial" purely to the Reader, because it has a latency cost when mixed with other refreshes, which happens often enough in UI ;). * Minor documentation tweaks around UIManager's `setDirty` to reflect that change. * ReaderFooter: Force a footer repaint on resume if it is visible (otherwise, just update it). * ReaderBookmark: In the same vein, don't repaint an invisible footer on bookmark count changes.
226 lines
6.2 KiB
Lua
226 lines
6.2 KiB
Lua
local Blitbuffer = require("ffi/blitbuffer")
|
|
local ButtonTable = require("ui/widget/buttontable")
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
local CloseButton = require("ui/widget/closebutton")
|
|
local Device = require("device")
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local Font = require("ui/font")
|
|
local HorizontalGroup = require("ui/widget/horizontalgroup")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local LineWidget = require("ui/widget/linewidget")
|
|
local OverlapGroup = require("ui/widget/overlapgroup")
|
|
local NumberPickerWidget = require("ui/widget/numberpickerwidget")
|
|
local Size = require("ui/size")
|
|
local TextBoxWidget = require("ui/widget/textboxwidget")
|
|
local TextWidget = require("ui/widget/textwidget")
|
|
local UIManager = require("ui/uimanager")
|
|
local VerticalGroup = require("ui/widget/verticalgroup")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
local _ = require("gettext")
|
|
local Screen = Device.screen
|
|
|
|
local TimeWidget = InputContainer:new{
|
|
title_face = Font:getFace("x_smalltfont"),
|
|
width = nil,
|
|
height = nil,
|
|
hour = 0,
|
|
hour_max = 23,
|
|
min = 0,
|
|
ok_text = _("OK"),
|
|
cancel_text = _("Cancel"),
|
|
}
|
|
|
|
function TimeWidget:init()
|
|
self.medium_font_face = Font:getFace("ffont")
|
|
self.light_bar = {}
|
|
self.screen_width = Screen:getWidth()
|
|
self.screen_height = Screen:getHeight()
|
|
self.width = math.floor(self.screen_width * 0.95)
|
|
if Device:hasKeys() then
|
|
self.key_events = {
|
|
Close = { {"Back"}, doc = "close time widget" }
|
|
}
|
|
end
|
|
if Device:isTouchDevice() then
|
|
self.ges_events = {
|
|
TapClose = {
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = Geom:new{
|
|
w = self.screen_width,
|
|
h = self.screen_height,
|
|
}
|
|
},
|
|
},
|
|
}
|
|
end
|
|
|
|
-- Actually the widget layout
|
|
self:update()
|
|
end
|
|
|
|
function TimeWidget:update()
|
|
local hour_widget = NumberPickerWidget:new{
|
|
show_parent = self,
|
|
width = math.floor(self.screen_width * 0.2),
|
|
value = self.hour,
|
|
value_min = 0,
|
|
value_max = self.hour_max,
|
|
value_step = 1,
|
|
value_hold_step = 4,
|
|
}
|
|
local min_widget = NumberPickerWidget:new{
|
|
show_parent = self,
|
|
width = math.floor(self.screen_width * 0.2),
|
|
value = self.min,
|
|
value_min = 0,
|
|
value_max = 59,
|
|
value_step = 1,
|
|
value_hold_step = 10,
|
|
}
|
|
local colon_space = TextBoxWidget:new{
|
|
text = ":",
|
|
alignment = "center",
|
|
face = self.title_face,
|
|
bold = true,
|
|
width = math.floor(self.screen_width * 0.2),
|
|
}
|
|
local time_group = HorizontalGroup:new{
|
|
align = "center",
|
|
hour_widget,
|
|
colon_space,
|
|
min_widget,
|
|
}
|
|
|
|
local closebutton = CloseButton:new{ window = self, padding_top = Size.margin.title, }
|
|
local time_title = FrameContainer:new{
|
|
padding = Size.padding.default,
|
|
margin = Size.margin.title,
|
|
bordersize = 0,
|
|
TextWidget:new{
|
|
text = self.title_text,
|
|
face = self.title_face,
|
|
bold = true,
|
|
max_width = math.floor(self.screen_width * 0.95) - closebutton:getSize().w,
|
|
},
|
|
}
|
|
local time_line = LineWidget:new{
|
|
dimen = Geom:new{
|
|
w = self.width,
|
|
h = Size.line.thick,
|
|
}
|
|
}
|
|
local time_bar = OverlapGroup:new{
|
|
dimen = {
|
|
w = self.width,
|
|
h = time_title:getSize().h
|
|
},
|
|
time_title,
|
|
closebutton,
|
|
}
|
|
local buttons = {
|
|
{
|
|
{
|
|
text = self.cancel_text,
|
|
callback = function()
|
|
self:onClose()
|
|
end,
|
|
},
|
|
{
|
|
text = self.ok_text,
|
|
callback = function()
|
|
if self.callback then
|
|
self.hour = hour_widget:getValue()
|
|
self.min = min_widget:getValue()
|
|
self:callback(self)
|
|
end
|
|
self:onClose()
|
|
end,
|
|
},
|
|
}
|
|
}
|
|
|
|
local ok_cancel_buttons = ButtonTable:new{
|
|
width = self.width - 2*Size.padding.default,
|
|
buttons = buttons,
|
|
zero_sep = true,
|
|
show_parent = self,
|
|
}
|
|
|
|
self.time_frame = FrameContainer:new{
|
|
radius = Size.radius.window,
|
|
padding = 0,
|
|
margin = 0,
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
VerticalGroup:new{
|
|
align = "left",
|
|
time_bar,
|
|
time_line,
|
|
CenterContainer:new{
|
|
dimen = Geom:new{
|
|
w = math.floor(self.screen_width * 0.95),
|
|
h = math.floor(time_group:getSize().h * 1.2),
|
|
},
|
|
time_group
|
|
},
|
|
CenterContainer:new{
|
|
dimen = Geom:new{
|
|
w = self.width,
|
|
h = ok_cancel_buttons:getSize().h,
|
|
},
|
|
ok_cancel_buttons
|
|
}
|
|
}
|
|
}
|
|
self[1] = WidgetContainer:new{
|
|
align = "center",
|
|
dimen = Geom:new{
|
|
x = 0, y = 0,
|
|
w = self.screen_width,
|
|
h = self.screen_height,
|
|
},
|
|
FrameContainer:new{
|
|
bordersize = 0,
|
|
self.time_frame,
|
|
}
|
|
}
|
|
UIManager:setDirty(self, function()
|
|
return "ui", self.time_frame.dimen
|
|
end)
|
|
end
|
|
|
|
function TimeWidget:onCloseWidget()
|
|
UIManager:setDirty(nil, function()
|
|
return "ui", self.time_frame.dimen
|
|
end)
|
|
return true
|
|
end
|
|
|
|
function TimeWidget:onShow()
|
|
UIManager:setDirty(self, function()
|
|
return "ui", self.time_frame.dimen
|
|
end)
|
|
return true
|
|
end
|
|
|
|
function TimeWidget:onAnyKeyPressed()
|
|
UIManager:close(self)
|
|
return true
|
|
end
|
|
|
|
function TimeWidget:onTapClose(arg, ges_ev)
|
|
if ges_ev.pos:notIntersectWith(self.time_frame.dimen) then
|
|
self:onClose()
|
|
end
|
|
return true
|
|
end
|
|
|
|
function TimeWidget:onClose()
|
|
UIManager:close(self)
|
|
return true
|
|
end
|
|
|
|
return TimeWidget
|