mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does). * Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint * And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE * Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example). * Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name) * Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background). * KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds. * In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights. * ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons. * KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked. * Menu: Ditto. * TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p). * Bump base https://github.com/koreader/koreader-base/pull/1280 https://github.com/koreader/koreader-base/pull/1282 https://github.com/koreader/koreader-base/pull/1283 https://github.com/koreader/koreader-base/pull/1284 * Bump android-luajit-launcher https://github.com/koreader/android-luajit-launcher/pull/284 https://github.com/koreader/android-luajit-launcher/pull/285 https://github.com/koreader/android-luajit-launcher/pull/286 https://github.com/koreader/android-luajit-launcher/pull/287
335 lines
11 KiB
Lua
335 lines
11 KiB
Lua
--[[--
|
|
A button widget that shows text or an icon and handles callback when tapped.
|
|
|
|
@usage
|
|
local Button = require("ui/widget/button")
|
|
local button = Button:new{
|
|
text = _("Press me!"),
|
|
enabled = false, -- defaults to true
|
|
callback = some_callback_function,
|
|
width = Screen:scaleBySize(50),
|
|
max_width = Screen:scaleBySize(100),
|
|
bordersize = Screen:scaleBySize(3),
|
|
margin = 0,
|
|
padding = Screen:scaleBySize(2),
|
|
}
|
|
--]]
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
local Device = require("device")
|
|
local Font = require("ui/font")
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local IconWidget = require("ui/widget/iconwidget")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local Size = require("ui/size")
|
|
local TextWidget = require("ui/widget/textwidget")
|
|
local UIManager = require("ui/uimanager")
|
|
local _ = require("gettext")
|
|
local Screen = Device.screen
|
|
|
|
local Button = InputContainer:new{
|
|
text = nil, -- mandatory
|
|
text_func = nil,
|
|
icon = nil,
|
|
icon_width = Screen:scaleBySize(DGENERIC_ICON_SIZE), -- our icons are square
|
|
icon_height = Screen:scaleBySize(DGENERIC_ICON_SIZE),
|
|
icon_rotation_angle = 0,
|
|
preselect = false,
|
|
callback = nil,
|
|
enabled = true,
|
|
hidden = false,
|
|
allow_hold_when_disabled = false,
|
|
margin = 0,
|
|
bordersize = Size.border.button,
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
radius = nil,
|
|
padding = Size.padding.button,
|
|
padding_h = nil,
|
|
padding_v = nil,
|
|
width = nil,
|
|
max_width = nil,
|
|
text_font_face = "cfont",
|
|
text_font_size = 20,
|
|
text_font_bold = true,
|
|
vsync = nil, -- when "flash_ui" is enabled, allow bundling the highlight with the callback, and fence that batch away from the unhighlight. Avoid delays when callback requires a "partial" on Kobo Mk. 7, c.f., ffi/framebuffer_mxcfb for more details.
|
|
}
|
|
|
|
function Button:init()
|
|
-- Prefer an optional text_func over text
|
|
if self.text_func and type(self.text_func) == "function" then
|
|
self.text = self.text_func()
|
|
end
|
|
|
|
if not self.padding_h then
|
|
self.padding_h = self.padding
|
|
end
|
|
if not self.padding_v then
|
|
self.padding_v = self.padding
|
|
end
|
|
|
|
if self.text then
|
|
self.label_widget = TextWidget:new{
|
|
text = self.text,
|
|
max_width = self.max_width and self.max_width - 2*self.padding_h - 2*self.margin - 2*self.bordersize or nil,
|
|
fgcolor = self.enabled and Blitbuffer.COLOR_BLACK or Blitbuffer.COLOR_DARK_GRAY,
|
|
bold = self.text_font_bold,
|
|
face = Font:getFace(self.text_font_face, self.text_font_size)
|
|
}
|
|
else
|
|
self.label_widget = IconWidget:new{
|
|
icon = self.icon,
|
|
rotation_angle = self.icon_rotation_angle,
|
|
dim = not self.enabled,
|
|
width = self.icon_width,
|
|
height = self.icon_height,
|
|
}
|
|
end
|
|
local widget_size = self.label_widget:getSize()
|
|
if self.width == nil then
|
|
self.width = widget_size.w
|
|
end
|
|
-- set FrameContainer content
|
|
self.frame = FrameContainer:new{
|
|
margin = self.margin,
|
|
bordersize = self.bordersize,
|
|
background = self.background,
|
|
radius = self.radius,
|
|
padding_top = self.padding_v,
|
|
padding_bottom = self.padding_v,
|
|
padding_left = self.padding_h,
|
|
padding_right = self.padding_h,
|
|
CenterContainer:new{
|
|
dimen = Geom:new{
|
|
w = self.width,
|
|
h = widget_size.h
|
|
},
|
|
self.label_widget,
|
|
}
|
|
}
|
|
if self.preselect then
|
|
self.frame.invert = true
|
|
end
|
|
self.dimen = self.frame:getSize()
|
|
self[1] = self.frame
|
|
if Device:isTouchDevice() then
|
|
self.ges_events = {
|
|
TapSelectButton = {
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = self.dimen,
|
|
},
|
|
doc = "Tap Button",
|
|
},
|
|
HoldSelectButton = {
|
|
GestureRange:new{
|
|
ges = "hold",
|
|
range = self.dimen,
|
|
},
|
|
doc = "Hold Button",
|
|
},
|
|
-- Safe-guard for when used inside a MovableContainer
|
|
HoldReleaseSelectButton = {
|
|
GestureRange:new{
|
|
ges = "hold_release",
|
|
range = self.dimen,
|
|
},
|
|
}
|
|
}
|
|
end
|
|
end
|
|
|
|
function Button:setText(text, width)
|
|
self.text = text
|
|
self.width = width
|
|
self:init()
|
|
end
|
|
|
|
function Button:setIcon(icon)
|
|
self.icon = icon
|
|
self.width = nil
|
|
self:init()
|
|
end
|
|
|
|
function Button:onFocus()
|
|
if self.no_focus then return end
|
|
self.frame.invert = true
|
|
return true
|
|
end
|
|
|
|
function Button:onUnfocus()
|
|
if self.no_focus then return end
|
|
self.frame.invert = false
|
|
return true
|
|
end
|
|
|
|
function Button:enable()
|
|
if not self.enabled then
|
|
if self.text then
|
|
self.label_widget.fgcolor = Blitbuffer.COLOR_BLACK
|
|
self.enabled = true
|
|
else
|
|
self.label_widget.dim = false
|
|
self.enabled = true
|
|
end
|
|
end
|
|
end
|
|
|
|
function Button:disable()
|
|
if self.enabled then
|
|
if self.text then
|
|
self.label_widget.fgcolor = Blitbuffer.COLOR_DARK_GRAY
|
|
self.enabled = false
|
|
else
|
|
self.label_widget.dim = true
|
|
self.enabled = false
|
|
end
|
|
end
|
|
end
|
|
|
|
function Button:enableDisable(enable)
|
|
if enable then
|
|
self:enable()
|
|
else
|
|
self:disable()
|
|
end
|
|
end
|
|
|
|
function Button:hide()
|
|
if self.icon and not self.hidden then
|
|
self.frame.orig_background = self.frame.background
|
|
self.frame.background = nil
|
|
self.label_widget.hide = true
|
|
self.hidden = true
|
|
end
|
|
end
|
|
|
|
function Button:show()
|
|
if self.icon and self.hidden then
|
|
self.label_widget.hide = false
|
|
self.frame.background = self.frame.orig_background
|
|
self.hidden = false
|
|
end
|
|
end
|
|
|
|
function Button:showHide(show)
|
|
if show then
|
|
self:show()
|
|
else
|
|
self:hide()
|
|
end
|
|
end
|
|
|
|
function Button:onTapSelectButton()
|
|
if self.enabled and self.callback then
|
|
if G_reader_settings:isFalse("flash_ui") then
|
|
self.callback()
|
|
else
|
|
-- NOTE: self[1] -> self.frame, if you're confused about what this does vs. onFocus/onUnfocus ;).
|
|
if self.text then
|
|
-- We only want the button's *highlight* to have rounded corners (otherwise they're redundant, same color as the bg).
|
|
-- The nil check is to discriminate the default from callers that explicitly request a specific radius.
|
|
if self[1].radius == nil then
|
|
self[1].radius = Size.radius.button
|
|
-- And here, it's easier to just invert the bg/fg colors ourselves,
|
|
-- so as to preserve the rounded corners in one step.
|
|
self[1].background = self[1].background:invert()
|
|
self.label_widget.fgcolor = self.label_widget.fgcolor:invert()
|
|
-- We do *NOT* set the invert flag, because it just adds an invertRect step at the end of the paintTo process,
|
|
-- and we've already taken care of inversion in a way that won't mangle the rounded corners.
|
|
else
|
|
self[1].invert = true
|
|
end
|
|
|
|
UIManager:widgetRepaint(self[1], self[1].dimen.x, self[1].dimen.y)
|
|
-- But do make sure the invert flag is set in both cases, mainly for the early return check below
|
|
self[1].invert = true
|
|
else
|
|
self[1].invert = true
|
|
UIManager:widgetInvert(self[1], self[1].dimen.x, self[1].dimen.y)
|
|
end
|
|
UIManager:setDirty(nil, function()
|
|
return "fast", self[1].dimen
|
|
end)
|
|
|
|
-- Force the repaint *now*, so we don't have to delay the callback to see the highlight...
|
|
if not self.vsync then
|
|
-- NOTE: Allow bundling the highlight with the callback when we request vsync, to prevent further delays
|
|
UIManager:forceRePaint() -- Ensures we have a chance to see the highlight
|
|
end
|
|
self.callback()
|
|
UIManager:forceRePaint() -- Ensures whatever the callback wanted to paint will be shown *now*...
|
|
if self.vsync then
|
|
-- NOTE: This is mainly useful when the callback caused a REAGL update that we do not explicitly fence already,
|
|
-- (i.e., Kobo Mk. 7).
|
|
UIManager:waitForVSync() -- ...and that the EPDC will not wait to coalesce it with the *next* update,
|
|
-- because that would have a chance to noticeably delay it until the unhighlight.
|
|
end
|
|
|
|
if not self[1] or not self[1].invert or not self[1].dimen then
|
|
-- If the widget no longer exists (destroyed, re-init'ed by setText(), or not inverted: nothing to invert back
|
|
return true
|
|
end
|
|
|
|
-- If the callback closed our parent (which ought to have been the top level widget), abort early
|
|
if UIManager:getTopWidget() ~= self.show_parent then
|
|
return true
|
|
end
|
|
|
|
self[1].invert = false
|
|
if self.text then
|
|
if self[1].radius == Size.radius.button then
|
|
self[1].radius = nil
|
|
self[1].background = self[1].background:invert()
|
|
self.label_widget.fgcolor = self.label_widget.fgcolor:invert()
|
|
end
|
|
|
|
UIManager:widgetRepaint(self[1], self[1].dimen.x, self[1].dimen.y)
|
|
else
|
|
UIManager:widgetInvert(self[1], self[1].dimen.x, self[1].dimen.y)
|
|
end
|
|
-- If the button was disabled, switch to UI to make sure the gray comes through unharmed ;).
|
|
UIManager:setDirty(nil, function()
|
|
return self.enabled and "fast" or "ui", self[1].dimen
|
|
end)
|
|
--UIManager:forceRePaint() -- Ensures the unhighlight happens now, instead of potentially waiting and having it batched with something else.
|
|
end
|
|
elseif self.tap_input then
|
|
self:onInput(self.tap_input)
|
|
elseif type(self.tap_input_func) == "function" then
|
|
self:onInput(self.tap_input_func())
|
|
end
|
|
if self.readonly ~= true then
|
|
return true
|
|
end
|
|
end
|
|
|
|
function Button:onHoldSelectButton()
|
|
if self.hold_callback and (self.enabled or self.allow_hold_when_disabled) then
|
|
self.hold_callback()
|
|
elseif self.hold_input then
|
|
self:onInput(self.hold_input, true)
|
|
elseif type(self.hold_input_func) == "function" then
|
|
self:onInput(self.hold_input_func(), true)
|
|
end
|
|
if self.readonly ~= true then
|
|
return true
|
|
end
|
|
end
|
|
|
|
function Button:onHoldReleaseSelectButton()
|
|
-- Safe-guard for when used inside a MovableContainer,
|
|
-- which would handle HoldRelease and process it like
|
|
-- a Hold if we wouldn't return true here
|
|
if self.hold_callback and (self.enabled or self.allow_hold_when_disabled) then
|
|
return true
|
|
elseif self.hold_input or type(self.hold_input_func) == "function" then
|
|
return true
|
|
end
|
|
return false
|
|
end
|
|
|
|
return Button
|