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.
60 lines
1.7 KiB
Lua
60 lines
1.7 KiB
Lua
--[[--
|
|
AlphaContainer will paint its content (a single widget) at the specified opacity level (0..1)
|
|
|
|
Example:
|
|
|
|
local alpha
|
|
alpha = AlphaContainer:new{
|
|
alpha = 0.7,
|
|
|
|
FrameContainer:new{
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
bordersize = Size.border.default,
|
|
margin = 0,
|
|
padding = Size.padding.default
|
|
}
|
|
}
|
|
--]]
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
local AlphaContainer = WidgetContainer:extend{
|
|
alpha = 1,
|
|
-- we cache a blitbuffer object for re-use here:
|
|
private_bb = nil,
|
|
}
|
|
|
|
function AlphaContainer:paintTo(bb, x, y)
|
|
local contentSize = self[1]:getSize()
|
|
|
|
if not self.private_bb
|
|
or self.private_bb:getWidth() ~= contentSize.w
|
|
or self.private_bb:getHeight() ~= contentSize.h
|
|
then
|
|
if self.private_bb then
|
|
self.private_bb:free() -- free the one we're going to replace
|
|
end
|
|
-- create a private blitbuffer for our child widget to paint to
|
|
self.private_bb = Blitbuffer.new(contentSize.w, contentSize.h, bb:getType())
|
|
-- fill it with our usual background color
|
|
self.private_bb:fill(Blitbuffer.COLOR_WHITE)
|
|
end
|
|
|
|
-- now, compose our child widget's content on our private blitbuffer canvas
|
|
self[1]:paintTo(self.private_bb, 0, 0)
|
|
|
|
-- and finally blit the private blitbuffer to the target blitbuffer at the requested opacity level
|
|
bb:addblitFrom(self.private_bb, x, y, 0, 0, contentSize.w, contentSize.h, self.alpha)
|
|
end
|
|
|
|
function AlphaContainer:onCloseWidget()
|
|
if self.private_bb then
|
|
self.private_bb:free()
|
|
self.private_bb = nil
|
|
end
|
|
end
|
|
|
|
|
|
return AlphaContainer
|