mirror of
https://github.com/koreader/koreader
synced 2024-11-18 03:25:46 +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.
131 lines
3.6 KiB
Lua
131 lines
3.6 KiB
Lua
--[[--
|
|
WidgetContainer is a container for one or multiple Widgets. It is the base
|
|
class for all the container widgets.
|
|
|
|
Child widgets are stored in WidgetContainer as conventional array items:
|
|
|
|
WidgetContainer:new{
|
|
ChildWidgetFoo:new{},
|
|
ChildWidgetBar:new{},
|
|
...
|
|
}
|
|
|
|
It handles event propagation and painting (with different alignments) for its children.
|
|
]]
|
|
|
|
local Geom = require("ui/geometry")
|
|
local Widget = require("ui/widget/widget")
|
|
local Device = require("device")
|
|
|
|
if Device.should_restrict_JIT then
|
|
jit.off(true, true)
|
|
end
|
|
|
|
local WidgetContainer = Widget:new()
|
|
|
|
function WidgetContainer:init()
|
|
if self.dimen then
|
|
if self.initDimen then
|
|
self:initDimen()
|
|
else
|
|
if not self.dimen.w then
|
|
self.dimen.w = self[1]:getSize().w
|
|
end
|
|
if not self.dimen.h then
|
|
self.dimen.h = self[1]:getSize().h
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
function WidgetContainer:getSize()
|
|
if self.dimen then
|
|
-- fixed size
|
|
return self.dimen
|
|
elseif self[1] then
|
|
-- return size of first child widget
|
|
return self[1]:getSize()
|
|
else
|
|
return Geom:new{ w = 0, h = 0 }
|
|
end
|
|
end
|
|
|
|
--[[--
|
|
Deletes all child widgets.
|
|
]]
|
|
function WidgetContainer:clear(skip_free)
|
|
-- HorizontalGroup & VerticalGroup call us after already having called free,
|
|
-- so allow skipping this one ;).
|
|
if not skip_free then
|
|
-- Make sure we free 'em before orphaning them...
|
|
self:free()
|
|
end
|
|
|
|
while table.remove(self) do end
|
|
end
|
|
|
|
function WidgetContainer:paintTo(bb, x, y)
|
|
-- default to pass request to first child widget
|
|
if self[1] then
|
|
x = x + (self.dimen.x or 0)
|
|
y = y + (self.dimen.y or 0)
|
|
if self.align == "top" then
|
|
local contentSize = self[1]:getSize()
|
|
self[1]:paintTo(bb,
|
|
x + math.floor((self.dimen.w - contentSize.w)/2), y)
|
|
elseif self.align == "bottom" then
|
|
local contentSize = self[1]:getSize()
|
|
self[1]:paintTo(bb,
|
|
x + math.floor((self.dimen.w - contentSize.w)/2),
|
|
y + (self.dimen.h - contentSize.h))
|
|
elseif self.align == "center" then
|
|
local contentSize = self[1]:getSize()
|
|
self[1]:paintTo(bb,
|
|
x + math.floor((self.dimen.w - contentSize.w)/2),
|
|
y + math.floor((self.dimen.h - contentSize.h)/2))
|
|
else
|
|
return self[1]:paintTo(bb, x, y)
|
|
end
|
|
end
|
|
end
|
|
|
|
function WidgetContainer:propagateEvent(event)
|
|
-- propagate to children
|
|
for _, widget in ipairs(self) do
|
|
if widget:handleEvent(event) then
|
|
-- stop propagating when an event handler returns true
|
|
return true
|
|
end
|
|
end
|
|
return false
|
|
end
|
|
|
|
--[[--
|
|
WidgetContainer will pass event to its children by calling their handleEvent
|
|
methods. If no child consumes the event (by returning true), it will try
|
|
to react to the event by itself.
|
|
|
|
@tparam ui.event.Event event
|
|
@treturn bool true if event is consumed, otherwise false. A consumed event will
|
|
not be sent to other widgets.
|
|
]]
|
|
function WidgetContainer:handleEvent(event)
|
|
if not self:propagateEvent(event) then
|
|
-- call our own standard event handler
|
|
return Widget.handleEvent(self, event)
|
|
else
|
|
return true
|
|
end
|
|
end
|
|
|
|
function WidgetContainer:free()
|
|
for _, widget in ipairs(self) do
|
|
if widget.free then
|
|
--print("WidgetContainer: Calling free for widget", debug.getinfo(widget.free, "S").short_src, widget, "from", debug.getinfo(self.free, "S").short_src, self)
|
|
widget:free()
|
|
end
|
|
end
|
|
end
|
|
|
|
return WidgetContainer
|