2017-08-15 12:18:15 +00:00
|
|
|
--[[--
|
|
|
|
A layout widget that puts objects under each other.
|
|
|
|
--]]
|
|
|
|
|
2019-12-06 21:55:37 +00:00
|
|
|
local BD = require("ui/bidi")
|
2013-10-18 20:38:07 +00:00
|
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
|
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 VerticalGroup = WidgetContainer:extend{
|
2014-03-13 13:52:43 +00:00
|
|
|
align = "center",
|
2019-12-06 21:55:37 +00:00
|
|
|
allow_mirroring = true,
|
2014-03-13 13:52:43 +00:00
|
|
|
_size = nil,
|
2019-12-06 21:55:37 +00:00
|
|
|
_offsets = {},
|
2013-10-18 20:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function VerticalGroup:getSize()
|
2014-03-13 13:52:43 +00:00
|
|
|
if not self._size then
|
|
|
|
self._size = { w = 0, h = 0 }
|
|
|
|
self._offsets = { }
|
|
|
|
for i, widget in ipairs(self) do
|
|
|
|
local w_size = widget:getSize()
|
|
|
|
self._offsets[i] = {
|
|
|
|
x = w_size.w,
|
|
|
|
y = self._size.h,
|
|
|
|
}
|
|
|
|
self._size.h = self._size.h + w_size.h
|
|
|
|
if w_size.w > self._size.w then
|
|
|
|
self._size.w = w_size.w
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return self._size
|
2013-10-18 20:38:07 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function VerticalGroup:paintTo(bb, x, y)
|
2014-03-13 13:52:43 +00:00
|
|
|
local size = self:getSize()
|
2019-12-06 21:55:37 +00:00
|
|
|
local align = self.align
|
2022-01-15 23:42:17 +00:00
|
|
|
if BD.mirroredUILayout() and self.allow_mirroring then
|
2019-12-06 21:55:37 +00:00
|
|
|
if align == "left" then
|
|
|
|
align = "right"
|
|
|
|
elseif align == "right" then
|
|
|
|
align = "left"
|
|
|
|
end
|
|
|
|
end
|
2013-10-18 20:38:07 +00:00
|
|
|
|
2014-03-13 13:52:43 +00:00
|
|
|
for i, widget in ipairs(self) do
|
2019-12-06 21:55:37 +00:00
|
|
|
if align == "center" then
|
2014-03-13 13:52:43 +00:00
|
|
|
widget:paintTo(bb,
|
|
|
|
x + math.floor((size.w - self._offsets[i].x) / 2),
|
|
|
|
y + self._offsets[i].y)
|
2019-12-06 21:55:37 +00:00
|
|
|
elseif align == "left" then
|
2014-03-13 13:52:43 +00:00
|
|
|
widget:paintTo(bb, x, y + self._offsets[i].y)
|
2019-12-06 21:55:37 +00:00
|
|
|
elseif align == "right" then
|
2014-03-13 13:52:43 +00:00
|
|
|
widget:paintTo(bb,
|
|
|
|
x + size.w - self._offsets[i].x,
|
|
|
|
y + self._offsets[i].y)
|
|
|
|
end
|
|
|
|
end
|
2013-10-18 20:38:07 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function VerticalGroup:clear()
|
2014-03-13 13:52:43 +00:00
|
|
|
self:free()
|
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
|
|
|
-- Skip WidgetContainer:clear's free call, we just did that in our own free ;)
|
|
|
|
WidgetContainer.clear(self, true)
|
2013-10-18 20:38:07 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function VerticalGroup:resetLayout()
|
2014-03-13 13:52:43 +00:00
|
|
|
self._size = nil
|
|
|
|
self._offsets = {}
|
2013-10-18 20:38:07 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function VerticalGroup:free()
|
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
|
|
|
--print("VerticalGroup:free on", self)
|
2014-03-13 13:52:43 +00:00
|
|
|
self:resetLayout()
|
|
|
|
WidgetContainer.free(self)
|
2013-10-18 20:38:07 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
return VerticalGroup
|