mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +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.
87 lines
2.4 KiB
Lua
87 lines
2.4 KiB
Lua
--[[--
|
||
Button widget that shows an "×" and handles closing window when tapped
|
||
|
||
Example:
|
||
|
||
local CloseButton = require("ui/widget/closebutton")
|
||
local parent_widget = OverlapGroup:new{}
|
||
table.insert(parent_widget, CloseButton:new{
|
||
window = parent_widget,
|
||
})
|
||
UIManager:show(parent_widget)
|
||
|
||
]]
|
||
|
||
local Font = require("ui/font")
|
||
local FrameContainer = require("ui/widget/container/framecontainer")
|
||
local GestureRange = require("ui/gesturerange")
|
||
local InputContainer = require("ui/widget/container/inputcontainer")
|
||
local TextWidget = require("ui/widget/textwidget")
|
||
local Screen = require("device").screen
|
||
|
||
local CloseButton = InputContainer:extend{
|
||
overlap_align = "right",
|
||
window = nil,
|
||
padding_left = Screen:scaleBySize(14), -- for larger touch area
|
||
padding_right = 0,
|
||
padding_top = 0,
|
||
padding_bottom = 0,
|
||
}
|
||
|
||
function CloseButton:init()
|
||
local text_widget = TextWidget:new{
|
||
text = "×",
|
||
face = Font:getFace("cfont", 30),
|
||
}
|
||
|
||
-- The text box height is greater than its width, and we want this × to be
|
||
-- diagonally aligned with the top right corner (assuming padding_right=0,
|
||
-- or padding_right = padding_top so the diagonal aligment is preserved).
|
||
local text_size = text_widget:getSize()
|
||
local text_width_pad = (text_size.h - text_size.w) / 2
|
||
|
||
self[1] = FrameContainer:new{
|
||
bordersize = 0,
|
||
padding = 0,
|
||
padding_top = self.padding_top,
|
||
padding_bottom = self.padding_bottom,
|
||
padding_left = self.padding_left,
|
||
padding_right = self.padding_right + text_width_pad,
|
||
text_widget,
|
||
}
|
||
|
||
self.ges_events.Close = {
|
||
GestureRange:new{
|
||
ges = "tap",
|
||
-- x and y coordinates for the widget is only known after the it is
|
||
-- drawn. so use callback to get range at runtime.
|
||
range = function() return self.dimen end,
|
||
},
|
||
doc = "Tap on close button",
|
||
}
|
||
|
||
self.ges_events.HoldClose = {
|
||
GestureRange:new{
|
||
ges = "hold_release",
|
||
range = function() return self.dimen end,
|
||
},
|
||
doc = "Hold on close button",
|
||
}
|
||
end
|
||
|
||
function CloseButton:onClose()
|
||
if self.window.onClose then
|
||
self.window:onClose()
|
||
end
|
||
return true
|
||
end
|
||
|
||
function CloseButton:onHoldClose()
|
||
if self.window.onHoldClose then
|
||
self.window:onHoldClose()
|
||
end
|
||
return true
|
||
end
|
||
|
||
return CloseButton
|