2018-04-19 12:24:04 +00:00
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
|
|
|
local ButtonTable = require("ui/widget/buttontable")
|
|
|
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
|
|
|
local Device = require("device")
|
2022-01-25 00:32:46 +00:00
|
|
|
|
local FocusManager = require("ui/widget/focusmanager")
|
2018-04-19 12:24:04 +00:00
|
|
|
|
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 MovableContainer = require("ui/widget/container/movablecontainer")
|
|
|
|
|
local NumberPickerWidget = require("ui/widget/numberpickerwidget")
|
|
|
|
|
local Size = require("ui/size")
|
|
|
|
|
local TextWidget = require("ui/widget/textwidget")
|
2022-01-19 11:02:13 +00:00
|
|
|
|
local TitleBar = require("ui/widget/titlebar")
|
2018-04-19 12:24:04 +00:00
|
|
|
|
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
|
2021-12-01 11:42:54 +00:00
|
|
|
|
local T = require("ffi/util").template
|
2018-04-19 12:24:04 +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 DoubleSpinWidget = FocusManager:extend{
|
2019-12-11 22:12:55 +00:00
|
|
|
|
title_text = "",
|
2018-04-19 12:24:04 +00:00
|
|
|
|
title_face = Font:getFace("x_smalltfont"),
|
2020-05-09 11:16:09 +00:00
|
|
|
|
info_text = nil,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
width = nil,
|
2021-10-01 18:32:16 +00:00
|
|
|
|
width_factor = nil, -- number between 0 and 1, factor to the smallest of screen width and height
|
2018-04-19 12:24:04 +00:00
|
|
|
|
height = nil,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
left_text = _("Left"),
|
2018-04-19 12:24:04 +00:00
|
|
|
|
left_min = 1,
|
2019-12-11 22:12:55 +00:00
|
|
|
|
left_max = 20,
|
|
|
|
|
left_value = 1,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
left_precision = nil, -- default "%02d" in NumberPickerWidget
|
|
|
|
|
left_wrap = false,
|
|
|
|
|
right_text = _("Right"),
|
2018-04-19 12:24:04 +00:00
|
|
|
|
right_min = 1,
|
2019-12-11 22:12:55 +00:00
|
|
|
|
right_max = 20,
|
|
|
|
|
right_value = 1,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
right_precision = nil,
|
|
|
|
|
right_wrap = false,
|
2020-05-09 11:16:09 +00:00
|
|
|
|
cancel_text = _("Close"),
|
|
|
|
|
ok_text = _("Apply"),
|
2022-05-23 22:25:50 +00:00
|
|
|
|
ok_always_enabled = false, -- set to true to enable OK button for unchanged values
|
2021-01-11 17:14:17 +00:00
|
|
|
|
cancel_callback = nil,
|
|
|
|
|
callback = nil,
|
|
|
|
|
close_callback = nil,
|
2020-05-09 11:16:09 +00:00
|
|
|
|
keep_shown_on_apply = false,
|
2022-10-04 11:44:55 +00:00
|
|
|
|
-- Set both left and right defaults to add upper button that sets spin values to default values
|
|
|
|
|
left_default = nil,
|
|
|
|
|
right_default = nil,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
default_text = nil,
|
|
|
|
|
-- Optional extra button above ok/cancel buttons row
|
2020-05-09 11:16:09 +00:00
|
|
|
|
extra_text = nil,
|
|
|
|
|
extra_callback = nil,
|
2022-05-23 22:25:50 +00:00
|
|
|
|
is_range = false, -- show a range separator in default button and between the spinners
|
|
|
|
|
unit = nil,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
function DoubleSpinWidget:init()
|
2018-04-19 12:24:04 +00:00
|
|
|
|
self.screen_width = Screen:getWidth()
|
|
|
|
|
self.screen_height = Screen:getHeight()
|
2021-10-01 18:32:16 +00:00
|
|
|
|
if not self.width then
|
|
|
|
|
if not self.width_factor then
|
|
|
|
|
self.width_factor = 0.8 -- default if no width speficied
|
|
|
|
|
end
|
|
|
|
|
self.width = math.floor(math.min(self.screen_width, self.screen_height) * self.width_factor)
|
|
|
|
|
end
|
2018-04-19 12:24:04 +00:00
|
|
|
|
if Device:hasKeys() then
|
2022-01-25 00:32:46 +00:00
|
|
|
|
self.key_events.Close = { {Device.input.group.Back}, doc = "close doublespin widget" }
|
2018-04-19 12:24:04 +00:00
|
|
|
|
end
|
|
|
|
|
if Device:isTouchDevice() then
|
|
|
|
|
self.ges_events = {
|
|
|
|
|
TapClose = {
|
|
|
|
|
GestureRange:new{
|
|
|
|
|
ges = "tap",
|
|
|
|
|
range = Geom:new{
|
|
|
|
|
w = self.screen_width,
|
|
|
|
|
h = self.screen_height,
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
2019-12-11 22:12:55 +00:00
|
|
|
|
}
|
2018-04-19 12:24:04 +00:00
|
|
|
|
end
|
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
|
|
|
|
|
2022-05-23 22:25:50 +00:00
|
|
|
|
if self.unit and self.unit ~= "" then
|
|
|
|
|
self.left_precision = self.left_precision and self.left_precision or "%1d"
|
|
|
|
|
self.right_precision = self.right_precision and self.right_precision or "%1d"
|
|
|
|
|
end
|
|
|
|
|
|
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
|
|
|
|
-- Actually the widget layout
|
2018-04-19 12:24:04 +00:00
|
|
|
|
self:update()
|
|
|
|
|
end
|
|
|
|
|
|
2021-12-01 17:58:48 +00:00
|
|
|
|
function DoubleSpinWidget:update(numberpicker_left_value, numberpicker_right_value)
|
2022-04-11 11:32:30 +00:00
|
|
|
|
local prev_movable_offset = self.movable and self.movable:getMovedOffset()
|
|
|
|
|
local prev_movable_alpha = self.movable and self.movable.alpha
|
2022-01-25 00:32:46 +00:00
|
|
|
|
self.layout = {}
|
2018-04-19 12:24:04 +00:00
|
|
|
|
local left_widget = NumberPickerWidget:new{
|
|
|
|
|
show_parent = self,
|
2021-12-01 17:58:48 +00:00
|
|
|
|
value = numberpicker_left_value or self.left_value,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
value_min = self.left_min,
|
|
|
|
|
value_max = self.left_max,
|
2020-02-16 00:03:12 +00:00
|
|
|
|
value_step = self.left_step,
|
|
|
|
|
value_hold_step = self.left_hold_step,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
precision = self.left_precision,
|
|
|
|
|
wrap = self.left_wrap,
|
2022-05-23 22:25:50 +00:00
|
|
|
|
unit = self.unit,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
}
|
2022-01-25 00:32:46 +00:00
|
|
|
|
self:mergeLayoutInHorizontal(left_widget)
|
2018-04-19 12:24:04 +00:00
|
|
|
|
local right_widget = NumberPickerWidget:new{
|
|
|
|
|
show_parent = self,
|
2021-12-01 17:58:48 +00:00
|
|
|
|
value = numberpicker_right_value or self.right_value,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
value_min = self.right_min,
|
|
|
|
|
value_max = self.right_max,
|
2020-02-16 00:03:12 +00:00
|
|
|
|
value_step = self.right_step,
|
|
|
|
|
value_hold_step = self.right_hold_step,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
precision = self.right_precision,
|
|
|
|
|
wrap = self.right_wrap,
|
2022-05-23 22:25:50 +00:00
|
|
|
|
unit = self.unit,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
}
|
2022-01-25 00:32:46 +00:00
|
|
|
|
self:mergeLayoutInHorizontal(right_widget)
|
2021-12-01 17:58:48 +00:00
|
|
|
|
left_widget.picker_updated_callback = function(value)
|
|
|
|
|
self:update(value, right_widget:getValue())
|
|
|
|
|
end
|
|
|
|
|
right_widget.picker_updated_callback = function(value)
|
|
|
|
|
self:update(left_widget:getValue(), value)
|
|
|
|
|
end
|
2022-05-23 22:25:50 +00:00
|
|
|
|
local separator_widget = TextWidget:new{
|
|
|
|
|
text = self.is_range and "–" or "",
|
|
|
|
|
face = self.title_face,
|
|
|
|
|
bold = true,
|
|
|
|
|
}
|
2021-12-03 06:48:40 +00:00
|
|
|
|
|
2021-12-01 17:58:48 +00:00
|
|
|
|
local text_max_width = math.floor(0.95 * self.width / 2)
|
2019-12-11 22:12:55 +00:00
|
|
|
|
local left_vertical_group = VerticalGroup:new{
|
2018-04-19 12:24:04 +00:00
|
|
|
|
align = "center",
|
2019-12-11 22:12:55 +00:00
|
|
|
|
left_widget,
|
|
|
|
|
}
|
2022-05-23 22:25:50 +00:00
|
|
|
|
local separator_vertical_group = VerticalGroup:new{
|
|
|
|
|
align = "center",
|
|
|
|
|
separator_widget,
|
|
|
|
|
}
|
2019-12-11 22:12:55 +00:00
|
|
|
|
local right_vertical_group = VerticalGroup:new{
|
|
|
|
|
align = "center",
|
2022-05-23 22:25:50 +00:00
|
|
|
|
right_widget,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if self.left_text ~= "" or self.right_text ~= "" then
|
|
|
|
|
table.insert(left_vertical_group, 1, TextWidget:new{
|
|
|
|
|
text = self.left_text,
|
|
|
|
|
face = self.title_face,
|
|
|
|
|
max_width = text_max_width,
|
|
|
|
|
})
|
|
|
|
|
table.insert(separator_vertical_group, 1, TextWidget:new{
|
|
|
|
|
text = "",
|
|
|
|
|
face = self.title_face,
|
|
|
|
|
})
|
|
|
|
|
table.insert(right_vertical_group, 1, TextWidget:new{
|
2019-12-11 22:12:55 +00:00
|
|
|
|
text = self.right_text,
|
|
|
|
|
face = self.title_face,
|
2021-12-01 17:58:48 +00:00
|
|
|
|
max_width = text_max_width,
|
2022-05-23 22:25:50 +00:00
|
|
|
|
})
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
local widget_group = HorizontalGroup:new{
|
|
|
|
|
align = "center",
|
|
|
|
|
CenterContainer:new{
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
w = self.width / 2,
|
|
|
|
|
h = left_vertical_group:getSize().h,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
},
|
2022-05-23 22:25:50 +00:00
|
|
|
|
left_vertical_group,
|
|
|
|
|
},
|
|
|
|
|
CenterContainer:new{
|
|
|
|
|
dimen = Geom:new{},
|
|
|
|
|
separator_vertical_group,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
},
|
2019-12-11 22:12:55 +00:00
|
|
|
|
CenterContainer:new{
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
w = self.width / 2,
|
|
|
|
|
h = right_vertical_group:getSize().h,
|
|
|
|
|
},
|
2022-05-23 22:25:50 +00:00
|
|
|
|
right_vertical_group,
|
|
|
|
|
},
|
2018-04-19 12:24:04 +00:00
|
|
|
|
}
|
2022-01-19 11:02:13 +00:00
|
|
|
|
|
|
|
|
|
local title_bar = TitleBar:new{
|
|
|
|
|
width = self.width,
|
|
|
|
|
align = "left",
|
|
|
|
|
with_bottom_line = true,
|
|
|
|
|
title = self.title_text,
|
|
|
|
|
title_shrink_font_to_fit = true,
|
|
|
|
|
info_text = self.info_text,
|
|
|
|
|
show_parent = self,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
}
|
2021-12-01 11:42:54 +00:00
|
|
|
|
|
|
|
|
|
local buttons = {}
|
2022-10-04 11:44:55 +00:00
|
|
|
|
if self.left_default and self.right_default then
|
2022-05-23 22:25:50 +00:00
|
|
|
|
local separator = self.is_range and "–" or "/"
|
|
|
|
|
local unit = ""
|
|
|
|
|
if self.unit then
|
|
|
|
|
if self.unit == "°" then
|
|
|
|
|
unit = self.unit
|
|
|
|
|
elseif self.unit ~= "" then
|
|
|
|
|
unit = "\xE2\x80\xAF" .. self.unit -- use Narrow No-Break Space (NNBSP) here
|
|
|
|
|
end
|
|
|
|
|
end
|
2021-12-01 11:42:54 +00:00
|
|
|
|
table.insert(buttons, {
|
2018-04-19 12:24:04 +00:00
|
|
|
|
{
|
2022-05-23 22:25:50 +00:00
|
|
|
|
text = self.default_text or T(_("Default values: %1%3 %4 %2%3"),
|
2021-12-01 11:42:54 +00:00
|
|
|
|
self.left_precision and string.format(self.left_precision, self.left_default) or self.left_default,
|
2022-05-23 22:25:50 +00:00
|
|
|
|
self.right_precision and string.format(self.right_precision, self.right_default) or self.right_default,
|
|
|
|
|
unit, separator),
|
2018-04-19 12:24:04 +00:00
|
|
|
|
callback = function()
|
|
|
|
|
left_widget.value = self.left_default
|
|
|
|
|
right_widget.value = self.right_default
|
|
|
|
|
left_widget:update()
|
|
|
|
|
right_widget:update()
|
|
|
|
|
end,
|
2019-12-11 22:12:55 +00:00
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
end
|
2020-05-09 11:16:09 +00:00
|
|
|
|
if self.extra_text then
|
2021-12-01 11:42:54 +00:00
|
|
|
|
table.insert(buttons, {
|
2020-05-09 11:16:09 +00:00
|
|
|
|
{
|
|
|
|
|
text = self.extra_text,
|
|
|
|
|
callback = function()
|
|
|
|
|
if self.extra_callback then
|
|
|
|
|
self.extra_callback(left_widget:getValue(), right_widget:getValue())
|
|
|
|
|
end
|
|
|
|
|
if not self.keep_shown_on_apply then -- assume extra wants it same as ok
|
|
|
|
|
self:onClose()
|
|
|
|
|
end
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
end
|
2021-12-01 11:42:54 +00:00
|
|
|
|
table.insert(buttons, {
|
|
|
|
|
{
|
|
|
|
|
text = self.cancel_text,
|
|
|
|
|
callback = function()
|
|
|
|
|
if self.cancel_callback then
|
|
|
|
|
self.cancel_callback()
|
|
|
|
|
end
|
|
|
|
|
self:onClose()
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text = self.ok_text,
|
2022-05-23 22:25:50 +00:00
|
|
|
|
enabled = self.ok_always_enabled or self.left_value ~= left_widget:getValue()
|
|
|
|
|
or self.right_value ~= right_widget:getValue(),
|
2021-12-01 11:42:54 +00:00
|
|
|
|
callback = function()
|
2021-12-01 17:58:48 +00:00
|
|
|
|
self.left_value = left_widget:getValue()
|
|
|
|
|
self.right_value = right_widget:getValue()
|
2021-12-01 11:42:54 +00:00
|
|
|
|
if self.callback then
|
2021-12-01 17:58:48 +00:00
|
|
|
|
self.callback(self.left_value, self.right_value)
|
2021-12-01 11:42:54 +00:00
|
|
|
|
end
|
2021-12-01 17:58:48 +00:00
|
|
|
|
if self.keep_shown_on_apply then
|
|
|
|
|
self:update()
|
|
|
|
|
else
|
2021-12-01 11:42:54 +00:00
|
|
|
|
self:onClose()
|
|
|
|
|
end
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
})
|
2018-04-19 12:24:04 +00:00
|
|
|
|
|
|
|
|
|
local button_table = ButtonTable:new{
|
|
|
|
|
width = self.width - 2*Size.padding.default,
|
|
|
|
|
buttons = buttons,
|
|
|
|
|
zero_sep = true,
|
|
|
|
|
show_parent = self,
|
|
|
|
|
}
|
2022-01-25 00:32:46 +00:00
|
|
|
|
self:mergeLayoutInVertical(button_table)
|
2018-04-19 12:24:04 +00:00
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
self.widget_frame = FrameContainer:new{
|
2018-04-19 12:24:04 +00:00
|
|
|
|
radius = Size.radius.window,
|
|
|
|
|
padding = 0,
|
|
|
|
|
margin = 0,
|
|
|
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
|
|
|
VerticalGroup:new{
|
|
|
|
|
align = "left",
|
2022-01-19 11:02:13 +00:00
|
|
|
|
title_bar,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
CenterContainer:new{
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
w = self.width,
|
2021-12-01 11:42:54 +00:00
|
|
|
|
h = widget_group:getSize().h + 4 * Size.padding.large,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
},
|
2019-12-11 22:12:55 +00:00
|
|
|
|
widget_group
|
2018-04-19 12:24:04 +00:00
|
|
|
|
},
|
|
|
|
|
CenterContainer:new{
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
w = self.width,
|
|
|
|
|
h = button_table:getSize().h,
|
|
|
|
|
},
|
|
|
|
|
button_table
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
self.movable = MovableContainer:new{
|
2022-04-11 11:32:30 +00:00
|
|
|
|
alpha = prev_movable_alpha,
|
2019-12-11 22:12:55 +00:00
|
|
|
|
self.widget_frame,
|
2018-04-19 12:24:04 +00:00
|
|
|
|
}
|
|
|
|
|
self[1] = WidgetContainer:new{
|
|
|
|
|
align = "center",
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
x = 0, y = 0,
|
|
|
|
|
w = self.screen_width,
|
|
|
|
|
h = self.screen_height,
|
|
|
|
|
},
|
|
|
|
|
self.movable,
|
|
|
|
|
}
|
2022-04-11 11:32:30 +00:00
|
|
|
|
if prev_movable_offset then
|
|
|
|
|
self.movable:setMovedOffset(prev_movable_offset)
|
|
|
|
|
end
|
2022-03-04 20:20:00 +00:00
|
|
|
|
self:refocusWidget()
|
Revamp flash_ui handling, once more, with feeling ;) (#7262)
* Simplify flash_ui handling (by handling the unhighlight pre-callback, c.f., #7262 for more details).
* UIManager: Handle translucent window-level widgets (and those wrapped in a translucent MovableContainer) properly in setDirty directly, making sure what's *underneath* them gets repainted to avoid alpha layering glitches. (This was previously handled via localized hacks).
* Update UIManager's documentation, and format it properly for ldoc parsing, making the HTML docs more useful.
* ReaderView: Reinitialize the various page areas when opening a new document, to prevent poisoning from the previous document.
* Event: Handle nils in an event's arguments.
* CheckButton/RadioButton: Switch to simple inversion to handle highlighting
* CheckButton: Make the highlight span the inner frame's width, instead of just the text's width, if possible.
* AlphaContainer: Fix & simplify, given the UIManager alpha handling.
* MovableContainer: When translucent, cache the canvas bb used for composition.
* Avoid spurious refreshes in a few widgets using various dummy *TextWidgets in order to first compute a text height.
* KeyValuePage: Avoid floats in size computations.
2021-02-20 17:22:48 +00:00
|
|
|
|
UIManager:setDirty(self, function()
|
|
|
|
|
return "ui", self.widget_frame.dimen
|
|
|
|
|
end)
|
2018-04-19 12:24:04 +00:00
|
|
|
|
end
|
|
|
|
|
|
2020-05-09 11:16:09 +00:00
|
|
|
|
function DoubleSpinWidget:hasMoved()
|
|
|
|
|
local offset = self.movable:getMovedOffset()
|
|
|
|
|
return offset.x ~= 0 or offset.y ~= 0
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
function DoubleSpinWidget:onCloseWidget()
|
2018-04-19 12:24:04 +00:00
|
|
|
|
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.widget_frame.dimen
|
2018-04-19 12:24:04 +00:00
|
|
|
|
end)
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
function DoubleSpinWidget:onShow()
|
2018-04-19 12:24:04 +00:00
|
|
|
|
UIManager:setDirty(self, function()
|
2019-12-11 22:12:55 +00:00
|
|
|
|
return "ui", self.widget_frame.dimen
|
2018-04-19 12:24:04 +00:00
|
|
|
|
end)
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
function DoubleSpinWidget:onAnyKeyPressed()
|
2021-01-11 17:14:17 +00:00
|
|
|
|
self:onClose()
|
2018-04-19 12:24:04 +00:00
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
function DoubleSpinWidget:onTapClose(arg, ges_ev)
|
|
|
|
|
if ges_ev.pos:notIntersectWith(self.widget_frame.dimen) then
|
2018-04-19 12:24:04 +00:00
|
|
|
|
self:onClose()
|
|
|
|
|
end
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
function DoubleSpinWidget:onClose()
|
2018-04-19 12:24:04 +00:00
|
|
|
|
UIManager:close(self)
|
2021-01-11 17:14:17 +00:00
|
|
|
|
if self.close_callback then
|
|
|
|
|
self.close_callback()
|
|
|
|
|
end
|
2018-04-19 12:24:04 +00:00
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
2019-12-11 22:12:55 +00:00
|
|
|
|
return DoubleSpinWidget
|