2016-02-14 21:47:36 +00:00
|
|
|
|
--[[--
|
|
|
|
|
Button widget that shows an "×" and handles closing window when tapped
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
2016-02-16 07:21:36 +00:00
|
|
|
|
local CloseButton = require("ui/widget/closebutton")
|
|
|
|
|
local parent_widget = OverlapGroup:new{}
|
2016-02-14 21:47:36 +00:00
|
|
|
|
table.insert(parent_widget, CloseButton:new{
|
|
|
|
|
window = parent_widget,
|
|
|
|
|
})
|
|
|
|
|
UIManager:show(parent_widget)
|
|
|
|
|
|
|
|
|
|
]]
|
|
|
|
|
|
2017-04-29 08:38:09 +00:00
|
|
|
|
local Font = require("ui/font")
|
2013-12-26 14:40:40 +00:00
|
|
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
2017-04-29 08:38:09 +00:00
|
|
|
|
local GestureRange = require("ui/gesturerange")
|
|
|
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
2013-12-26 14:40:40 +00:00
|
|
|
|
local TextWidget = require("ui/widget/textwidget")
|
2016-03-07 05:38:20 +00:00
|
|
|
|
local Screen = require("device").screen
|
2013-12-26 14:40:40 +00:00
|
|
|
|
|
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.
2022-10-06 00:14:48 +00:00
|
|
|
|
local CloseButton = InputContainer:extend{
|
2016-02-14 21:47:36 +00:00
|
|
|
|
overlap_align = "right",
|
2014-03-13 13:52:43 +00:00
|
|
|
|
window = nil,
|
2017-10-16 15:51:56 +00:00
|
|
|
|
padding_left = Screen:scaleBySize(14), -- for larger touch area
|
|
|
|
|
padding_right = 0,
|
|
|
|
|
padding_top = 0,
|
|
|
|
|
padding_bottom = 0,
|
2013-12-26 14:40:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function CloseButton:init()
|
2014-03-13 13:52:43 +00:00
|
|
|
|
local text_widget = TextWidget:new{
|
|
|
|
|
text = "×",
|
2017-10-16 15:51:56 +00:00
|
|
|
|
face = Font:getFace("cfont", 30),
|
2014-03-13 13:52:43 +00:00
|
|
|
|
}
|
2017-10-16 15:51:56 +00:00
|
|
|
|
|
2019-12-06 21:55:39 +00:00
|
|
|
|
-- 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).
|
2017-10-16 15:51:56 +00:00
|
|
|
|
local text_size = text_widget:getSize()
|
|
|
|
|
local text_width_pad = (text_size.h - text_size.w) / 2
|
2016-03-07 05:38:20 +00:00
|
|
|
|
|
2014-03-13 13:52:43 +00:00
|
|
|
|
self[1] = FrameContainer:new{
|
|
|
|
|
bordersize = 0,
|
|
|
|
|
padding = 0,
|
2017-10-16 15:51:56 +00:00
|
|
|
|
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,
|
2014-03-13 13:52:43 +00:00
|
|
|
|
}
|
2015-04-27 00:49:27 +00:00
|
|
|
|
|
2014-03-13 13:52:43 +00:00
|
|
|
|
self.ges_events.Close = {
|
|
|
|
|
GestureRange:new{
|
|
|
|
|
ges = "tap",
|
2016-03-07 05:38:20 +00:00
|
|
|
|
-- 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,
|
2014-03-13 13:52:43 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
2016-06-28 16:35:00 +00:00
|
|
|
|
|
|
|
|
|
self.ges_events.HoldClose = {
|
|
|
|
|
GestureRange:new{
|
|
|
|
|
ges = "hold_release",
|
|
|
|
|
range = function() return self.dimen end,
|
|
|
|
|
},
|
|
|
|
|
}
|
2013-12-26 14:40:40 +00:00
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function CloseButton:onClose()
|
2016-06-28 16:35:00 +00:00
|
|
|
|
if self.window.onClose then
|
|
|
|
|
self.window:onClose()
|
|
|
|
|
end
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function CloseButton:onHoldClose()
|
|
|
|
|
if self.window.onHoldClose then
|
|
|
|
|
self.window:onHoldClose()
|
|
|
|
|
end
|
2014-03-13 13:52:43 +00:00
|
|
|
|
return true
|
2013-12-26 14:40:40 +00:00
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
return CloseButton
|