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.
141 lines
4.3 KiB
Lua
141 lines
4.3 KiB
Lua
--[[--
|
|
A FrameContainer is some graphics content (1 widget) that is surrounded by a
|
|
frame
|
|
|
|
Example:
|
|
|
|
local frame
|
|
frame = FrameContainer:new{
|
|
radius = Size.radius.window,
|
|
bordersize = Size.border.window,
|
|
padding = 0,
|
|
margin = 0,
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
VerticalGroup:new{
|
|
-- etc
|
|
}
|
|
}
|
|
|
|
--]]
|
|
|
|
local BD = require("ui/bidi")
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local Geom = require("ui/geometry")
|
|
local Size = require("ui/size")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
local FrameContainer = WidgetContainer:extend{
|
|
background = nil,
|
|
color = Blitbuffer.COLOR_BLACK,
|
|
margin = 0,
|
|
radius = nil,
|
|
inner_bordersize = 0,
|
|
bordersize = Size.border.window,
|
|
padding = Size.padding.default,
|
|
padding_top = nil,
|
|
padding_right = nil,
|
|
padding_bottom = nil,
|
|
padding_left = nil,
|
|
width = nil,
|
|
height = nil,
|
|
invert = false,
|
|
allow_mirroring = true,
|
|
focusable = false,
|
|
focus_border_size = Size.border.window * 2,
|
|
focus_border_color = Blitbuffer.COLOR_BLACK,
|
|
}
|
|
|
|
function FrameContainer:getSize()
|
|
local content_size = self[1]:getSize()
|
|
self._padding_top = self.padding_top or self.padding
|
|
self._padding_right = self.padding_right or self.padding
|
|
self._padding_bottom = self.padding_bottom or self.padding
|
|
self._padding_left = self.padding_left or self.padding
|
|
if BD.mirroredUILayout() and self.allow_mirroring then
|
|
self._padding_left, self._padding_right = self._padding_right, self._padding_left
|
|
end
|
|
return Geom:new{
|
|
w = content_size.w + ( self.margin + self.bordersize ) * 2 + self._padding_left + self._padding_right,
|
|
h = content_size.h + ( self.margin + self.bordersize ) * 2 + self._padding_top + self._padding_bottom
|
|
}
|
|
end
|
|
|
|
function FrameContainer:onFocus()
|
|
if not self.focusable then
|
|
return false
|
|
end
|
|
self._origin_bordersize = self.bordersize
|
|
self._origin_border_color = self.color
|
|
self.bordersize = self.focus_border_size
|
|
self.color = self.focus_border_color
|
|
self._focused = true
|
|
return true
|
|
end
|
|
|
|
function FrameContainer:onUnfocus()
|
|
if not self.focusable then
|
|
return false
|
|
end
|
|
if self._focused then
|
|
self.bordersize = self._origin_bordersize
|
|
self.color = self._origin_border_color
|
|
self._focused = nil
|
|
return true
|
|
end
|
|
return false
|
|
end
|
|
|
|
|
|
function FrameContainer:paintTo(bb, x, y)
|
|
local my_size = self:getSize()
|
|
self.dimen = Geom:new{
|
|
x = x, y = y,
|
|
w = my_size.w,
|
|
h = my_size.h
|
|
}
|
|
local container_width = self.width or my_size.w
|
|
local container_height = self.height or my_size.h
|
|
|
|
local shift_x = 0
|
|
if BD.mirroredUILayout() and self.allow_mirroring then
|
|
shift_x = container_width - my_size.w
|
|
end
|
|
|
|
--- @todo get rid of margin here? 13.03 2013 (houqp)
|
|
if self.background then
|
|
bb:paintRoundedRect(x, y,
|
|
container_width, container_height,
|
|
self.background, self.radius)
|
|
end
|
|
if self.inner_bordersize > 0 then
|
|
--- @warning This doesn't actually support radius, it'll always be a square.
|
|
bb:paintInnerBorder(x + self.margin, y + self.margin,
|
|
container_width - self.margin * 2,
|
|
container_height - self.margin * 2,
|
|
self.inner_bordersize, self.color, self.radius)
|
|
end
|
|
if self.bordersize > 0 then
|
|
bb:paintBorder(x + self.margin, y + self.margin,
|
|
container_width - self.margin * 2,
|
|
container_height - self.margin * 2,
|
|
self.bordersize, self.color, self.radius)
|
|
end
|
|
if self[1] then
|
|
self[1]:paintTo(bb,
|
|
x + self.margin + self.bordersize + self._padding_left + shift_x,
|
|
y + self.margin + self.bordersize + self._padding_top)
|
|
end
|
|
if self.invert then
|
|
bb:invertRect(x + self.bordersize, y + self.bordersize,
|
|
container_width - 2*self.bordersize,
|
|
container_height - 2*self.bordersize)
|
|
end
|
|
if self.dim then
|
|
bb:dimRect(x + self.bordersize, y + self.bordersize,
|
|
container_width - 2*self.bordersize,
|
|
container_height - 2*self.bordersize)
|
|
end
|
|
end
|
|
|
|
return FrameContainer
|