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

Button: Better handling of translucent MovableContainer (#7223)

Browse Source 
* 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
This commit is contained in:
NiLuJe
2021-02-02 04:27:14 +01:00
committed by GitHub
parent 4a89c93290
commit 285fc75aa7
10 changed files with 96 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/ui/widget/spinwidget.lua
View File

@@ -78,10 +78,6 @@ function SpinWidget:init()
end
function SpinWidget:update()
-- This picker_update_callback will be redefined later.
-- It's a hack to restore transparency after a Button unhighlight in NumberPicker,
-- in case the MovableContainer was actually made transparent.
local picker_update_callback = function() end
local value_widget = NumberPickerWidget:new{
show_parent = self,
width = math.floor(self.screen_width * 0.2),
@@ -93,7 +89,6 @@ function SpinWidget:update()
value_step = self.value_step,
value_hold_step = self.value_hold_step,
precision = self.precision,
update_callback = function() picker_update_callback() end,
}
local value_group = HorizontalGroup:new{
align = "center",
@@ -239,29 +234,11 @@ function SpinWidget:update()
},
self.movable,
}
UIManager:setDirty(self, function()
return "ui", self.spin_frame.dimen
end)
picker_update_callback = function()
-- If we're actually transparent, force an alpha-aware repaint.
if self.movable.alpha then
if G_reader_settings:nilOrTrue("flash_ui") then
-- It's delayed to the next tick to actually catch a Button unhighlight.
UIManager:nextTick(function()
UIManager:setDirty("all", function()
return "ui", self.movable.dimen
end)
end)
else
-- This should only really be necessary for the up/down buttons here,
-- because they repaint the center value button & text, unlike said button,
-- which just pops up the VK.
-- On the upside, we shouldn't need to delay anything without flash_ui ;).
UIManager:setDirty("all", function()
return "ui", self.movable.dimen
end)
end
end
-- If we're translucent, Button itself will handle that post-callback, in order to preserve alpha without flickering.
if not self.movable.alpha then
UIManager:setDirty(self, function()
return "ui", self.spin_frame.dimen
end)
end
end