mirror of
https://github.com/koreader/koreader
synced 2024-11-16 06:12:56 +00:00
fadee1f5dc
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.
85 lines
2.4 KiB
Lua
85 lines
2.4 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:extend{
|
|
align = "center",
|
|
allow_mirroring = true,
|
|
_size = nil,
|
|
}
|
|
|
|
function HorizontalGroup:getSize()
|
|
if not self._size then
|
|
local _mirroredUI = BD.mirroredUILayout()
|
|
self._size = { w = 0, h = 0 }
|
|
self._offsets = { }
|
|
if _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 _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()
|
|
local _mirroredUI = BD.mirroredUILayout()
|
|
|
|
if _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 _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
|