renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revamp flash_ui handling, once more, with feeling ;) (#7262)

Browse Source 
* Simplify flash_ui handling (by handling the unhighlight pre-callback, c.f., #7262 for more details).
* UIManager: Handle translucent window-level widgets (and those wrapped in a translucent MovableContainer) properly in setDirty directly, making sure what's *underneath* them gets repainted to avoid alpha layering glitches. (This was previously handled via localized hacks).
* Update UIManager's documentation, and format it properly for ldoc parsing, making the HTML docs more useful.
* ReaderView: Reinitialize the various page areas when opening a new document, to prevent poisoning from the previous document.
* Event: Handle nils in an event's arguments.
* CheckButton/RadioButton: Switch to simple inversion to handle highlighting
* CheckButton: Make the highlight span the inner frame's width, instead of just the text's width, if possible.
* AlphaContainer: Fix & simplify, given the UIManager alpha handling.
* MovableContainer: When translucent, cache the canvas bb used for composition.
* Avoid spurious refreshes in a few widgets using various dummy *TextWidgets in order to first compute a text height.
* KeyValuePage: Avoid floats in size computations.
This commit is contained in:
NiLuJe
2021-02-20 18:22:48 +01:00
committed by GitHub
parent 1cdc6c61e0
commit fe10d0bce5
25 changed files with 707 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/ui/widget/checkbutton.lua
View File

@@ -32,6 +32,7 @@ local CheckButton = InputContainer:new{
checked = false,
enabled = true,
face = Font:getFace("cfont"),
background = Blitbuffer.COLOR_WHITE,
overlap_align = "right",
text = nil,
toggle_text = nil,
@@ -67,6 +68,7 @@ function CheckButton:initCheckButton(checked)
}
self._frame = FrameContainer:new{
bordersize = 0,
background = self.background,
margin = 0,
padding = 0,
self._horizontalgroup,
@@ -99,24 +101,32 @@ function CheckButton:onTapCheckButton()
if G_reader_settings:isFalse("flash_ui") then
self.callback()
else
-- c.f., ui/widget/iconbutton for the canonical documentation about the flash_ui code flow
-- Unlike RadioButton, the frame's width stops at the text width, but we want our highlight to span the full width...
-- (That's when we have one, some callers don't pass a width, so, handle that, too).
local highlight_dimen = self.dimen
highlight_dimen.w = self.width and self.width or self.dimen.w
-- Highlight
--
self[1].invert = true
UIManager:widgetRepaint(self[1], self.dimen.x, self.dimen.y)
UIManager:setDirty(nil, function()
return "fast", self.dimen
end)
UIManager:widgetInvert(self[1], highlight_dimen.x, highlight_dimen.y, highlight_dimen.w)
UIManager:setDirty(nil, "fast", highlight_dimen)
-- Force the repaint *now*, so we don't have to delay the callback to see the invert...
UIManager:forceRePaint()
self.callback()
--UIManager:forceRePaint() -- Unnecessary, the check/uncheck process involves too many repaints already
--UIManager:waitForVSync()
-- Unhighlight
--
self[1].invert = false
UIManager:widgetRepaint(self[1], self.dimen.x, self.dimen.y)
UIManager:setDirty(nil, function()
return "fast", self.dimen
end)
--UIManager:forceRePaint()
UIManager:widgetInvert(self[1], highlight_dimen.x, highlight_dimen.y, highlight_dimen.w)
UIManager:setDirty(nil, "ui", highlight_dimen)
-- Callback
--
self.callback()
UIManager:forceRePaint()
end
elseif self.tap_input then
self:onInput(self.tap_input)
@@ -140,14 +150,14 @@ end
function CheckButton:check()
self:initCheckButton(true)
UIManager:setDirty(self.parent, function()
return "fast", self.dimen
return "ui", self.dimen
end)
end
function CheckButton:unCheck()
self:initCheckButton(false)
UIManager:setDirty(self.parent, function()
return "fast", self.dimen
return "ui", self.dimen
end)
end
@@ -164,7 +174,6 @@ function CheckButton:disable()
self:initCheckButton(false)
UIManager:setDirty(self.parent, function()
return "ui", self.dimen
-- best to use "ui" instead of "fast" when we make things gray
end)
end