mirror of
https://github.com/koreader/koreader
synced 2024-11-18 03:25:46 +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.
29 lines
842 B
Lua
29 lines
842 B
Lua
--[[--
|
|
RightContainer aligns its content (1 widget) at the right of its own dimensions
|
|
--]]
|
|
|
|
local BD = require("ui/bidi")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
local RightContainer = WidgetContainer:extend{
|
|
allow_mirroring = true,
|
|
}
|
|
|
|
function RightContainer:paintTo(bb, x, y)
|
|
local contentSize = self[1]:getSize()
|
|
--- @fixme
|
|
-- if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then
|
|
-- throw error? paint to scrap buffer and blit partially?
|
|
-- for now, we ignore this
|
|
-- end
|
|
if not BD.mirroredUILayout() or not self.allow_mirroring then
|
|
x = x + (self.dimen.w - contentSize.w)
|
|
-- else: keep x, as in LeftContainer
|
|
end
|
|
self[1]:paintTo(bb,
|
|
x,
|
|
y + math.floor((self.dimen.h - contentSize.h)/2))
|
|
end
|
|
|
|
return RightContainer
|