2017-04-29 08:38:09 +00:00
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
2016-12-11 00:06:10 +00:00
|
|
|
local ButtonTable = require("ui/widget/buttontable")
|
|
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
|
|
local Device = require("device")
|
2017-04-29 08:38:09 +00:00
|
|
|
local Font = require("ui/font")
|
|
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
2016-12-11 00:06:10 +00:00
|
|
|
local Geom = require("ui/geometry")
|
2017-04-29 08:38:09 +00:00
|
|
|
local GestureRange = require("ui/gesturerange")
|
|
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
2018-01-29 20:27:24 +00:00
|
|
|
local MovableContainer = require("ui/widget/container/movablecontainer")
|
2017-09-13 14:56:20 +00:00
|
|
|
local Size = require("ui/size")
|
2016-12-11 00:06:10 +00:00
|
|
|
local TextBoxWidget = require("ui/widget/textboxwidget")
|
|
|
|
local VerticalGroup = require("ui/widget/verticalgroup")
|
2017-04-29 08:38:09 +00:00
|
|
|
local UIManager = require("ui/uimanager")
|
2016-12-11 00:06:10 +00:00
|
|
|
local VerticalSpan = require("ui/widget/verticalspan")
|
2017-04-29 08:38:09 +00:00
|
|
|
local _ = require("gettext")
|
|
|
|
local Screen = Device.screen
|
2016-12-11 00:06:10 +00:00
|
|
|
|
Clarify our OOP semantics across the codebase (#9586)
Basically:
* Use `extend` for class definitions
* Use `new` for object instantiations
That includes some minor code cleanups along the way:
* Updated `Widget`'s docs to make the semantics clearer.
* Removed `should_restrict_JIT` (it's been dead code since https://github.com/koreader/android-luajit-launcher/pull/283)
* Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass).
* Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events.
* Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier.
* Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references.
* ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak).
* Terminal: Make sure the shell is killed on plugin teardown.
* InputText: Fix Home/End/Del physical keys to behave sensibly.
* InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...).
* OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of.
* ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed!
* Kobo: Minor code cleanups.
2022-10-06 00:14:48 +00:00
|
|
|
local ButtonDialogTitle = InputContainer:extend{
|
2016-12-11 00:06:10 +00:00
|
|
|
title = nil,
|
|
|
|
title_align = nil,
|
2017-10-08 15:53:25 +00:00
|
|
|
title_face = Font:getFace("x_smalltfont"),
|
|
|
|
title_padding = Size.padding.large,
|
|
|
|
title_margin = Size.margin.title,
|
2022-09-17 22:11:03 +00:00
|
|
|
width = nil,
|
|
|
|
width_factor = nil, -- number between 0 and 1, factor to the smallest of screen width and height
|
2021-12-16 12:46:53 +00:00
|
|
|
use_info_style = true, -- set to false to have bold font style of the title
|
2019-04-02 16:27:35 +00:00
|
|
|
info_face = Font:getFace("infofont"),
|
|
|
|
info_padding = Size.padding.default,
|
|
|
|
info_margin = Size.margin.default,
|
2016-12-11 00:06:10 +00:00
|
|
|
buttons = nil,
|
|
|
|
tap_close_callback = nil,
|
2018-08-11 20:47:33 +00:00
|
|
|
dismissable = true, -- set to false if any button callback is required
|
2016-12-11 00:06:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function ButtonDialogTitle:init()
|
2022-09-17 22:11:03 +00:00
|
|
|
self.screen_width = Screen:getWidth()
|
|
|
|
self.screen_height = Screen:getHeight()
|
|
|
|
if not self.width then
|
|
|
|
if not self.width_factor then
|
|
|
|
self.width_factor = 0.9 -- default if no width specified
|
|
|
|
end
|
|
|
|
self.width = math.floor(math.min(self.screen_width, self.screen_height) * self.width_factor)
|
|
|
|
end
|
2018-08-11 20:47:33 +00:00
|
|
|
if self.dismissable then
|
|
|
|
if Device:hasKeys() then
|
2022-01-23 17:40:37 +00:00
|
|
|
local close_keys = Device:hasFewKeys() and { "Back", "Left" } or Device.input.group.Back
|
2022-10-27 00:01:51 +00:00
|
|
|
self.key_events.Close = { { close_keys } }
|
2018-08-11 20:47:33 +00:00
|
|
|
end
|
|
|
|
if Device:isTouchDevice() then
|
|
|
|
self.ges_events.TapClose = {
|
|
|
|
GestureRange:new {
|
|
|
|
ges = "tap",
|
|
|
|
range = Geom:new {
|
|
|
|
x = 0,
|
|
|
|
y = 0,
|
2022-09-17 22:11:03 +00:00
|
|
|
w = self.screen_width,
|
|
|
|
h = self.screen_height,
|
2018-08-11 20:47:33 +00:00
|
|
|
}
|
2016-12-11 00:06:10 +00:00
|
|
|
}
|
|
|
|
}
|
2018-08-11 20:47:33 +00:00
|
|
|
end
|
2016-12-11 00:06:10 +00:00
|
|
|
end
|
2023-03-23 17:37:38 +00:00
|
|
|
|
2022-10-04 11:44:17 +00:00
|
|
|
self.button_table = ButtonTable:new{
|
2023-03-23 17:37:38 +00:00
|
|
|
width = self.width - 2*Size.border.window - 2*Size.padding.button,
|
2022-10-04 11:44:17 +00:00
|
|
|
buttons = self.buttons,
|
|
|
|
zero_sep = true,
|
|
|
|
show_parent = self,
|
|
|
|
}
|
2023-03-23 17:37:38 +00:00
|
|
|
|
|
|
|
local title_padding = self.use_info_style and self.info_padding or self.title_padding
|
|
|
|
local title_margin = self.use_info_style and self.info_margin or self.title_margin
|
|
|
|
local title_width = self.width - 2 * (Size.border.window + Size.padding.button + title_padding + title_margin)
|
|
|
|
local title_widget = FrameContainer:new{
|
|
|
|
padding = title_padding,
|
|
|
|
margin = title_margin,
|
|
|
|
bordersize = 0,
|
|
|
|
TextBoxWidget:new{
|
|
|
|
text = self.title,
|
|
|
|
width = title_width,
|
|
|
|
face = self.use_info_style and self.info_face or self.title_face,
|
|
|
|
alignment = self.title_align or "left",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2016-12-11 00:06:10 +00:00
|
|
|
self[1] = CenterContainer:new{
|
|
|
|
dimen = Screen:getSize(),
|
2022-10-13 11:12:53 +00:00
|
|
|
ignore_if_over = "height",
|
2018-01-29 20:27:24 +00:00
|
|
|
MovableContainer:new{
|
2023-03-23 17:37:42 +00:00
|
|
|
anchor = self.anchor,
|
2018-01-29 20:27:24 +00:00
|
|
|
FrameContainer:new{
|
|
|
|
VerticalGroup:new{
|
|
|
|
align = "center",
|
2023-03-23 17:37:38 +00:00
|
|
|
title_widget,
|
2018-01-29 20:27:24 +00:00
|
|
|
VerticalSpan:new{ width = Size.span.vertical_default },
|
2022-10-04 11:44:17 +00:00
|
|
|
self.button_table,
|
2016-12-11 00:06:10 +00:00
|
|
|
},
|
2018-01-29 20:27:24 +00:00
|
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
|
|
bordersize = Size.border.window,
|
|
|
|
radius = Size.radius.window,
|
|
|
|
padding = Size.padding.button,
|
|
|
|
padding_bottom = 0, -- no padding below buttontable
|
|
|
|
}
|
2016-12-11 00:06:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2022-02-17 09:53:15 +00:00
|
|
|
function ButtonDialogTitle:setTitle(title)
|
|
|
|
self.title = title
|
|
|
|
self:free()
|
|
|
|
self:init()
|
|
|
|
UIManager:setDirty("all", "ui")
|
|
|
|
end
|
|
|
|
|
2016-12-11 00:06:10 +00:00
|
|
|
function ButtonDialogTitle:onShow()
|
|
|
|
UIManager:setDirty(self, function()
|
2023-02-07 00:01:05 +00:00
|
|
|
return "ui", self[1][1].dimen -- i.e., MovableContainer
|
2016-12-11 00:06:10 +00:00
|
|
|
end)
|
|
|
|
end
|
|
|
|
|
|
|
|
function ButtonDialogTitle:onCloseWidget()
|
|
|
|
UIManager:setDirty(nil, function()
|
Tame some ButtonTable users into re-using Buttontable instances if possible (#7166)
* 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.
2021-01-28 23:20:15 +00:00
|
|
|
return "ui", self[1][1].dimen
|
2016-12-11 00:06:10 +00:00
|
|
|
end)
|
|
|
|
end
|
|
|
|
|
|
|
|
function ButtonDialogTitle:onTapClose()
|
|
|
|
UIManager:close(self)
|
|
|
|
if self.tap_close_callback then
|
|
|
|
self.tap_close_callback()
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function ButtonDialogTitle:onClose()
|
|
|
|
self:onTapClose()
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function ButtonDialogTitle:paintTo(...)
|
|
|
|
InputContainer.paintTo(self, ...)
|
2023-02-07 00:01:05 +00:00
|
|
|
self.dimen = self[1][1].dimen
|
2016-12-11 00:06:10 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
return ButtonDialogTitle
|