Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

Profiles: make sure to close menu/quickmenu before executing action (#12299)

Browse Source 
Mainly a difference without distinction, but in some edge cases like screenshots it keeps the menu on the screen.
See <https://github.com/koreader/koreader/pull/12293#issuecomment-2269680044>.

The "Show as QuickMenu" is really just for balance; it makes little to no difference.
This commit is contained in:
Frans de Jonge 2024-08-06 15:15:08 +02:00 committed by GitHub
parent fd8c9be57f
commit 880b7c5ed1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/dispatcher.lua
View File

@ -1079,7 +1079,9 @@ function Dispatcher:_showAsMenu(settings, exec_props)
font_size = 22,
callback = function()
UIManager:close(quickmenu)
Dispatcher:execute(settings, { qm_show = false })
UIManager:nextTick(function()
Dispatcher:execute(settings, { qm_show = false })
end)
end,
}})
end
@ -1093,7 +1095,9 @@ function Dispatcher:_showAsMenu(settings, exec_props)
font_bold = false,
callback = function()
UIManager:close(quickmenu)
Dispatcher:execute({[v.key] = settings[v.key]})
UIManager:nextTick(function()
Dispatcher:execute({[v.key] = settings[v.key]})
end)
if keep_open_on_apply and not util.stringStartsWith(v.key, "touch_input") then
quickmenu:setTitle(title)
UIManager:show(quickmenu)
@ -1102,7 +1106,9 @@ function Dispatcher:_showAsMenu(settings, exec_props)
hold_callback = function()
if v.key:sub(1, 13) == "profile_exec_" then
UIManager:close(quickmenu)
UIManager:sendEvent(Event:new(settingsList[v.key].event, settingsList[v.key].arg, { qm_show = true }))
UIManager:nextTick(function()
UIManager:sendEvent(Event:new(settingsList[v.key].event, settingsList[v.key].arg, { qm_show = true }))
end)
end
end,
}})

4
plugins/profiles.koplugin/main.lua
View File

@ -124,14 +124,14 @@ function Profiles:getSubMenuItems()
text = _("Execute"),
callback = function(touchmenu_instance)
touchmenu_instance:onClose()
self:onProfileExecute(k, { qm_show = false })
UIManager:nextTick(self.onProfileExecute, self, k, { qm_show = false })
end,
},
{
text = _("Show as QuickMenu"),
callback = function(touchmenu_instance)
touchmenu_instance:onClose()
self:onProfileExecute(k, { qm_show = true })
UIManager:nextTick(self.onProfileExecute, self, k, { qm_show = true })
end,
},
{