mirror of
https://github.com/koreader/koreader
synced 2024-10-31 21:20:20 +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.
84 lines
2.3 KiB
Lua
84 lines
2.3 KiB
Lua
--[[--
|
|
A layout widget that puts objects besides each other.
|
|
--]]
|
|
|
|
local BD = require("ui/bidi")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
local util = require("util")
|
|
|
|
local HorizontalGroup = WidgetContainer:new{
|
|
align = "center",
|
|
allow_mirroring = true,
|
|
_mirroredUI = BD.mirroredUILayout(),
|
|
_size = nil,
|
|
}
|
|
|
|
function HorizontalGroup:getSize()
|
|
if not self._size then
|
|
self._size = { w = 0, h = 0 }
|
|
self._offsets = { }
|
|
if self._mirroredUI and self.allow_mirroring then
|
|
util.arrayReverse(self)
|
|
end
|
|
for i, widget in ipairs(self) do
|
|
local w_size = widget:getSize()
|
|
self._offsets[i] = {
|
|
x = self._size.w,
|
|
y = w_size.h
|
|
}
|
|
self._size.w = self._size.w + w_size.w
|
|
if w_size.h > self._size.h then
|
|
self._size.h = w_size.h
|
|
end
|
|
end
|
|
if self._mirroredUI and self.allow_mirroring then
|
|
util.arrayReverse(self)
|
|
end
|
|
end
|
|
return self._size
|
|
end
|
|
|
|
function HorizontalGroup:paintTo(bb, x, y)
|
|
local size = self:getSize()
|
|
|
|
if self._mirroredUI and self.allow_mirroring then
|
|
util.arrayReverse(self)
|
|
end
|
|
for i, widget in ipairs(self) do
|
|
if self.align == "center" then
|
|
widget:paintTo(bb,
|
|
x + self._offsets[i].x,
|
|
y + math.floor((size.h - self._offsets[i].y) / 2))
|
|
elseif self.align == "top" then
|
|
widget:paintTo(bb, x + self._offsets[i].x, y)
|
|
elseif self.align == "bottom" then
|
|
widget:paintTo(bb, x + self._offsets[i].x, y + size.h - self._offsets[i].y)
|
|
else
|
|
io.stderr:write("[!] invalid alignment for HorizontalGroup: ",
|
|
self.align)
|
|
end
|
|
end
|
|
if self._mirroredUI and self.allow_mirroring then
|
|
util.arrayReverse(self)
|
|
end
|
|
end
|
|
|
|
function HorizontalGroup:clear()
|
|
self:free()
|
|
-- Skip WidgetContainer:clear's free call, we just did that in our own free ;)
|
|
WidgetContainer.clear(self, true)
|
|
end
|
|
|
|
function HorizontalGroup:resetLayout()
|
|
self._size = nil
|
|
self._offsets = {}
|
|
end
|
|
|
|
function HorizontalGroup:free()
|
|
--print("HorizontalGroup:free on", self)
|
|
self:resetLayout()
|
|
WidgetContainer.free(self)
|
|
end
|
|
|
|
return HorizontalGroup
|