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.
63 lines
1.5 KiB
Lua
63 lines
1.5 KiB
Lua
local Blitbuffer = require("ffi/blitbuffer")
|
|
local Device = require("device")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local Size = require("ui/size")
|
|
local UIManager = require("ui/uimanager")
|
|
local Screen = Device.screen
|
|
|
|
local LinkBox = InputContainer:extend{
|
|
box = nil,
|
|
color = Blitbuffer.COLOR_DARK_GRAY,
|
|
radius = 0,
|
|
bordersize = Size.line.medium,
|
|
}
|
|
|
|
function LinkBox:init()
|
|
if Device:isTouchDevice() then
|
|
self.ges_events.TapClose = {
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = Geom:new{
|
|
x = 0, y = 0,
|
|
w = Screen:getWidth(),
|
|
h = Screen:getHeight(),
|
|
}
|
|
}
|
|
}
|
|
end
|
|
end
|
|
|
|
function LinkBox:paintTo(bb)
|
|
bb:paintBorder(self.box.x, self.box.y, self.box.w, self.box.h,
|
|
self.bordersize, self.color, self.radius)
|
|
end
|
|
|
|
function LinkBox:onCloseWidget()
|
|
UIManager:setDirty(nil, function()
|
|
return "partial", self.box
|
|
end)
|
|
end
|
|
|
|
function LinkBox:onShow()
|
|
UIManager:setDirty(self, function()
|
|
return "ui", self.box
|
|
end)
|
|
if self.timeout then
|
|
UIManager:scheduleIn(self.timeout, function()
|
|
UIManager:close(self)
|
|
if self.callback then self.callback() end
|
|
end)
|
|
end
|
|
return true
|
|
end
|
|
|
|
function LinkBox:onTapClose()
|
|
UIManager:close(self)
|
|
self.callback = nil
|
|
return true
|
|
end
|
|
|
|
return LinkBox
|