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

TouchMenu: allow help_text on disabled menu items

Browse Source 
Also don't propagate tap/hold on disabled menu items.
(When top and bottom menu displayed at the same time,
tap on a disabled top menu item could active some
bottom toggle change.)
This commit is contained in:
poire-z
2023-02-16 23:30:48 +01:00
parent 2f0954fa71
commit af1de5b6a3
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/ui/widget/touchmenu.lua
View File

@@ -170,7 +170,7 @@ function TouchMenuItem:onTapSelect(arg, ges)
if self.item.enabled_func then
enabled = self.item.enabled_func()
end
if enabled == false then return end
if enabled == false then return true end -- don't propagate
local tap_on_checkmark = false
if ges and ges.pos and ges.pos.x then
@@ -182,7 +182,7 @@ function TouchMenuItem:onTapSelect(arg, ges)
end
-- If the menu hasn't actually been drawn yet, don't do anything (as it's confusing, and the coordinates may be wrong).
if not self.item_frame.dimen then return end
if not self.item_frame.dimen then return true end
if G_reader_settings:isFalse("flash_ui") then
self.menu:onMenuSelect(self.item, tap_on_checkmark)
@@ -225,9 +225,21 @@ function TouchMenuItem:onHoldSelect(arg, ges)
if self.item.enabled_func then
enabled = self.item.enabled_func()
end
if enabled == false then return end
if enabled == false then
-- Allow help_text to be displayed even if menu item disabled
if self.item.help_text or type(self.item.help_text_func) == "function" then
local help_text = self.item.help_text
if self.item.help_text_func then
help_text = self.item.help_text_func(self)
end
if help_text then
UIManager:show(InfoMessage:new{ text = help_text, })
end
end
return true -- don't propagate
end
if not self.item_frame.dimen then return end
if not self.item_frame.dimen then return true end
if G_reader_settings:isFalse("flash_ui") then
self.menu:onMenuHold(self.item, self.text_truncated)