mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
285fc75aa7
* DictQuickLookup: Preserve alpha when switching dict, and scrolling inside a dict. * Start moving the NumberPicker alpha hack to Button itself This makes handling flash_ui easier and saner, avoiding flickering. * Handle the transparency hack entirely from within Button * Murder the now unnecessary NumberPicker update_callback hack * Tweak comments * And the Button handling made that redundant, too * Squish debug print * More comment tweaks * Reset transparency on scrolling instead of rpeserving it * Reset alpha when switching dictionaries * Simplify the pre/post callbakc transparency state handling And explain why we need to care. * Give a named reference to ButtonDialog's MovableContainer, so the Button alpha hack behaves with it * Document the "self.movable" convention * Amend that comment a bit e.g., we don't care much about MultiConfirmBox'w MpvableContainer, as any button action will close it. * And make SkimTo's MovableContainer accessible so that Button can grok that it's translucent
96 lines
2.7 KiB
Lua
96 lines
2.7 KiB
Lua
local Blitbuffer = require("ffi/blitbuffer")
|
|
local ButtonTable = require("ui/widget/buttontable")
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
local Device = require("device")
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local MovableContainer = require("ui/widget/container/movablecontainer")
|
|
local Size = require("ui/size")
|
|
local UIManager = require("ui/uimanager")
|
|
local _ = require("gettext")
|
|
local Screen = require("device").screen
|
|
|
|
local ButtonDialog = InputContainer:new{
|
|
buttons = nil,
|
|
tap_close_callback = nil,
|
|
alpha = nil, -- passed to MovableContainer
|
|
}
|
|
|
|
function ButtonDialog:init()
|
|
if Device:hasKeys() then
|
|
local close_keys = Device:hasFewKeys() and { "Back", "Left" } or "Back"
|
|
self.key_events = {
|
|
Close = { { close_keys }, doc = "close button dialog" }
|
|
}
|
|
end
|
|
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
|
|
self.movable = MovableContainer:new{
|
|
alpha = self.alpha,
|
|
FrameContainer:new{
|
|
ButtonTable:new{
|
|
width = math.floor(Screen:getWidth() * 0.9),
|
|
buttons = self.buttons,
|
|
show_parent = self,
|
|
},
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
bordersize = Size.border.window,
|
|
radius = Size.radius.window,
|
|
padding = Size.padding.button,
|
|
-- No padding at top or bottom to make all buttons
|
|
-- look the same size
|
|
padding_top = 0,
|
|
padding_bottom = 0,
|
|
}
|
|
}
|
|
|
|
self[1] = CenterContainer:new{
|
|
dimen = Screen:getSize(),
|
|
self.movable,
|
|
}
|
|
end
|
|
|
|
function ButtonDialog:onShow()
|
|
UIManager:setDirty(self, function()
|
|
return "ui", self.movable.dimen
|
|
end)
|
|
end
|
|
|
|
function ButtonDialog:onCloseWidget()
|
|
UIManager:setDirty(nil, function()
|
|
return "flashui", self.movable.dimen
|
|
end)
|
|
end
|
|
|
|
function ButtonDialog:onTapClose()
|
|
UIManager:close(self)
|
|
if self.tap_close_callback then
|
|
self.tap_close_callback()
|
|
end
|
|
return true
|
|
end
|
|
|
|
function ButtonDialog:onClose()
|
|
self:onTapClose()
|
|
return true
|
|
end
|
|
|
|
function ButtonDialog:paintTo(...)
|
|
InputContainer.paintTo(self, ...)
|
|
self.dimen = self.movable.dimen
|
|
end
|
|
|
|
return ButtonDialog
|