mirror of
https://github.com/koreader/koreader
synced 2024-10-31 21:20:20 +00:00
df0bbc9db7
* QuickDictLookup, ImageViewer, NumberPicker: Smarter `update` that will re-use most of the widget's layout instead of re-instantiating all the things. * SpinWidget/DoubleSpinWidget: The NumberPicker change above renders a hack to preserve alpha on these widgets almost unnecessary. Also fixed said hack to also apply to the center, value button. * Button: Don't re-instantiate the frame in setText/setIcon when unnecessary (e.g., no change at all, or no layout change). * Button: Add a refresh method that repaints and refreshes a *specific* Button (provided it's been painted once) all on its lonesome. * ConfigDialog: Free everything that's going to be re-instatiated on update * A few more post #7118 fixes: * SkimTo: Always flag the chapter nav buttons as vsync * Button: Fix the highlight on rounded buttons when vsync is enabled (e.g., it's now entirely visible, instead of showing a weird inverted corner glitch). * Some more heuristic tweaks in Menu/TouchMenu/Button/IconButton * ButtonTable: fix the annoying rounding issue I'd noticed in #7054 ;). * Enable dithering in TextBoxWidget (e.g., in the Wikipedia full view). This involved moving the HW dithering align fixup to base, where it always ought to have been ;). * Switch a few widgets that were using "partial" on close to "ui", or, more rarely, "flashui". The intent being to limit "partial" purely to the Reader, because it has a latency cost when mixed with other refreshes, which happens often enough in UI ;). * Minor documentation tweaks around UIManager's `setDirty` to reflect that change. * ReaderFooter: Force a footer repaint on resume if it is visible (otherwise, just update it). * ReaderBookmark: In the same vein, don't repaint an invisible footer on bookmark count changes.
174 lines
5.8 KiB
Lua
174 lines
5.8 KiB
Lua
--[[--
|
|
Button with a big icon image! Designed for touch devices.
|
|
--]]
|
|
|
|
local Device = require("device")
|
|
local HorizontalGroup = require("ui/widget/horizontalgroup")
|
|
local HorizontalSpan = require("ui/widget/horizontalspan")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local IconWidget = require("ui/widget/iconwidget")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local UIManager = require("ui/uimanager")
|
|
local VerticalGroup = require("ui/widget/verticalgroup")
|
|
local VerticalSpan = require("ui/widget/verticalspan")
|
|
local Screen = Device.screen
|
|
|
|
local IconButton = InputContainer:new{
|
|
icon = "notice-warning",
|
|
dimen = nil,
|
|
-- show_parent is used for UIManager:setDirty, so we can trigger repaint
|
|
show_parent = nil,
|
|
width = Screen:scaleBySize(DGENERIC_ICON_SIZE), -- our icons are square
|
|
height = Screen:scaleBySize(DGENERIC_ICON_SIZE),
|
|
padding = 0,
|
|
padding_top = nil,
|
|
padding_right = nil,
|
|
padding_bottom = nil,
|
|
padding_left = nil,
|
|
enabled = true,
|
|
callback = nil,
|
|
}
|
|
|
|
function IconButton:init()
|
|
self.image = IconWidget:new{
|
|
icon = self.icon,
|
|
width = self.width,
|
|
height = self.height,
|
|
}
|
|
|
|
self.show_parent = self.show_parent or self
|
|
|
|
self.horizontal_group = HorizontalGroup:new{}
|
|
table.insert(self.horizontal_group, HorizontalSpan:new{})
|
|
table.insert(self.horizontal_group, self.image)
|
|
table.insert(self.horizontal_group, HorizontalSpan:new{})
|
|
|
|
self.button = VerticalGroup:new{}
|
|
table.insert(self.button, VerticalSpan:new{})
|
|
table.insert(self.button, self.horizontal_group)
|
|
table.insert(self.button, VerticalSpan:new{})
|
|
|
|
self[1] = self.button
|
|
self:update()
|
|
end
|
|
|
|
function IconButton:update()
|
|
if not self.padding_top then self.padding_top = self.padding end
|
|
if not self.padding_right then self.padding_right = self.padding end
|
|
if not self.padding_bottom then self.padding_bottom = self.padding end
|
|
if not self.padding_left then self.padding_left = self.padding end
|
|
|
|
self.horizontal_group[1].width = self.padding_left
|
|
self.horizontal_group[3].width = self.padding_right
|
|
self.dimen = self.image:getSize()
|
|
self.dimen.w = self.dimen.w + self.padding_left+self.padding_right
|
|
|
|
self.button[1].width = self.padding_top
|
|
self.button[3].width = self.padding_bottom
|
|
self.dimen.h = self.dimen.h + self.padding_top+self.padding_bottom
|
|
self:initGesListener()
|
|
end
|
|
|
|
function IconButton:initGesListener()
|
|
if Device:isTouchDevice() then
|
|
self.ges_events = {
|
|
TapIconButton = {
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = self.dimen,
|
|
},
|
|
doc = "Tap IconButton",
|
|
},
|
|
HoldIconButton = {
|
|
GestureRange:new{
|
|
ges = "hold",
|
|
range = self.dimen,
|
|
},
|
|
doc = "Hold IconButton",
|
|
}
|
|
}
|
|
end
|
|
end
|
|
|
|
function IconButton:onTapIconButton()
|
|
if not self.callback then return end
|
|
if G_reader_settings:isFalse("flash_ui") then
|
|
self.callback()
|
|
else
|
|
self.image.invert = true
|
|
-- For ConfigDialog icons, we can't avoid that initial repaint...
|
|
UIManager:widgetInvert(self.image, self.dimen.x + self.padding_left, self.dimen.y + self.padding_top)
|
|
UIManager:setDirty(nil, function()
|
|
return "fast", self.dimen
|
|
end)
|
|
|
|
-- Force the repaint *now*, so we don't have to delay the callback to see the invert...
|
|
UIManager:forceRePaint()
|
|
self.callback()
|
|
UIManager:forceRePaint()
|
|
--UIManager:waitForVSync()
|
|
|
|
self.image.invert = false
|
|
-- If the callback closed our parent (which may not always be the top-level widget, or even *a* window-level widget), we're done
|
|
local top_widget = UIManager:getTopWidget()
|
|
if top_widget == self.show_parent or UIManager:isSubwidgetShown(self.show_parent) then
|
|
-- If the callback popped up the VK, it prevents us from finessing this any further, so repaint the whole stack
|
|
if top_widget == "VirtualKeyboard" then
|
|
UIManager:waitForVSync()
|
|
UIManager:setDirty(self.show_parent, function()
|
|
return "ui", self.dimen
|
|
end)
|
|
return true
|
|
end
|
|
|
|
-- If the callback popped up a modal above us, repaint the whole stack
|
|
if top_widget ~= self.show_parent and top_widget.modal and self.dimen:intersectWith(UIManager:getPreviousRefreshRegion()) then
|
|
UIManager:waitForVSync()
|
|
UIManager:setDirty(self.show_parent, function()
|
|
return "ui", self.dimen
|
|
end)
|
|
return true
|
|
end
|
|
|
|
-- Otherwise, we can unhighlight it safely
|
|
UIManager:widgetInvert(self.image, self.dimen.x + self.padding_left, self.dimen.y + self.padding_top)
|
|
UIManager:setDirty(nil, function()
|
|
return "fast", self.dimen
|
|
end)
|
|
else
|
|
-- Callback closed our parent, we're done
|
|
return true
|
|
end
|
|
--UIManager:forceRePaint()
|
|
end
|
|
return true
|
|
end
|
|
|
|
function IconButton:onHoldIconButton()
|
|
if self.enabled and self.hold_callback then
|
|
self.hold_callback()
|
|
elseif self.hold_input then
|
|
self:onInput(self.hold_input)
|
|
elseif type(self.hold_input_func) == "function" then
|
|
self:onInput(self.hold_input_func())
|
|
elseif self.hold_callback == nil then return end
|
|
return true
|
|
end
|
|
|
|
function IconButton:onFocus()
|
|
--quick and dirty, need better way to show focus
|
|
self.image.invert = true
|
|
return true
|
|
end
|
|
|
|
function IconButton:onUnfocus()
|
|
self.image.invert = false
|
|
return true
|
|
end
|
|
|
|
function IconButton:onTapSelect()
|
|
self:onTapIconButton()
|
|
end
|
|
|
|
return IconButton
|