|
|
|
|
--[[--
|
|
|
|
|
An UnderlineContainer is a WidgetContainer that is able to paint
|
|
|
|
|
a line under its child node.
|
|
|
|
|
--]]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
|
|
|
local Geom = require("ui/geometry")
|
|
|
|
|
local Size = require("ui/size")
|
|
|
|
|
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.
2 years ago
|
|
|
local UnderlineContainer = WidgetContainer:extend{
|
|
|
|
|
linesize = Size.line.thick,
|
|
|
|
|
padding = Size.padding.tiny,
|
|
|
|
|
--- @todo shouldn't this default to black instead?
|
|
|
|
|
color = Blitbuffer.COLOR_WHITE,
|
|
|
|
|
vertical_align = "top",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function UnderlineContainer:getSize()
|
|
|
|
|
local contentSize = self[1]:getSize()
|
|
|
|
|
return Geom:new{
|
|
|
|
|
w = contentSize.w,
|
|
|
|
|
h = contentSize.h + self.linesize + 2*self.padding
|
|
|
|
|
}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function UnderlineContainer:paintTo(bb, x, y)
|
|
|
|
|
local container_size = self:getSize()
|
|
|
|
|
if not self.dimen then
|
|
|
|
|
self.dimen = Geom:new{
|
|
|
|
|
x = x, y = y,
|
|
|
|
|
w = container_size.w,
|
|
|
|
|
h = container_size.h
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
self.dimen.x = x
|
|
|
|
|
self.dimen.y = y
|
|
|
|
|
-- Possibly redundant
|
|
|
|
|
self.dimen.w = container_size.w
|
|
|
|
|
self.dimen.h = container_size.h
|
|
|
|
|
end
|
|
|
|
|
local content_size = self[1]:getSize()
|
|
|
|
|
local p_y = y
|
|
|
|
|
if self.vertical_align == "center" then
|
|
|
|
|
p_y = math.floor((container_size.h - content_size.h) / 2) + y
|
|
|
|
|
elseif self.vertical_align == "bottom" then
|
|
|
|
|
p_y = (container_size.h - content_size.h) + y
|
|
|
|
|
end
|
|
|
|
|
self[1]:paintTo(bb, x, p_y)
|
|
|
|
|
bb:paintRect(x, y + container_size.h - self.linesize,
|
|
|
|
|
container_size.w, self.linesize, self.color)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
return UnderlineContainer
|
