Partydeck/Monarch-Extension
3
0
Fork 0
mirror of https://github.com/britzl/monarch.git synced 2025-09-28 02:22:20 +02:00
Code Issues Projects Releases Wiki Activity

New options to keep focus on screens even when covered by other screens (#51)

Browse Source 
* Added option to continue to receive input when below a popup

* Added option to not remove input focus when a screen is put on top of another one
This commit is contained in:
Björn Ritzl
2019-08-03 15:44:39 +02:00
committed by GitHub
parent 354dc71b12
commit 478835f888
6 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
monarch/monarch.lua
View File

@@ -150,6 +150,8 @@ local function register(id, settings)
popup = settings and settings.popup,
popup_on_popup = settings and settings.popup_on_popup,
timestep_below_popup = settings and settings.timestep_below_popup or 1,
screen_keeps_input_focus_when_below_popup = settings and settings.screen_keeps_input_focus_when_below_popup or false,
others_keep_input_focus_when_below_screen = settings and settings.others_keep_input_focus_when_below_screen or false,
preload_listeners = {},
}
return screens[id]
@@ -166,13 +168,17 @@ end
-- * popup - true the screen is a popup
-- * popup_on_popup - true if this popup can be shown on top of
-- another popup or false if an underlying popup should be closed
-- * timestep_below_popup - Timestep to set on proxy when below a popup
-- * screen_keeps_input_focus_when_below_popup - If this screen should
-- keep input focus when below a popup
-- * others_keep_input_focus_when_below_screen - If screens below this
-- screen should keep input focus
-- * transition_url - URL to a script that is responsible for the
-- screen transitions
-- * focus_url - URL to a script that is to be notified of focus
-- lost/gained events
-- * receiver_url - URL to a script that is to receive messages sent
-- using monarch.send()
-- * timestep_below_popup - Timestep to set on proxy when below a popup
-- * auto_preload - true if the screen should be automatically preloaded
function M.register_proxy(id, proxy, settings)
assert(proxy, "You must provide a collection proxy URL")
@@ -200,6 +206,10 @@ M.register = M.register_proxy
-- * popup - true the screen is a popup
-- * popup_on_popup - true if this popup can be shown on top of
-- another popup or false if an underlying popup should be closed
-- * screen_keeps_input_focus_when_below_popup - If this screen should
-- keep input focus when below a popup
-- * others_keep_input_focus_when_below_screen - If screens below this
-- screen should keep input focus
-- * transition_id - Id of the game object in the collection that is responsible
-- for the screen transitions
-- * focus_id - Id of the game object in the collection that is to be notified
@@ -241,17 +251,25 @@ local function acquire_input(screen)
end
end
local function release_input(screen)
local function release_input(screen, next_screen)
log("release_input()", screen.id)
if screen.input then
if screen.proxy then
msg.post(screen.script, RELEASE_INPUT_FOCUS)
elseif screen.factory then
for id,instance in pairs(screen.factory_ids) do
msg.post(instance, RELEASE_INPUT_FOCUS)
local next_is_popup = next_screen and next_screen.popup
local keep_if_next_is_popup = next_is_popup and screen.screen_keeps_input_focus_when_below_popup
local keep_when_below_next = next_screen and next_screen.others_keep_input_focus_when_below_screen
local release_focus = not keep_if_next_is_popup and not keep_when_below_next
if release_focus then
if screen.proxy then
msg.post(screen.script, RELEASE_INPUT_FOCUS)
elseif screen.factory then
for id,instance in pairs(screen.factory_ids) do
msg.post(instance, RELEASE_INPUT_FOCUS)
end
end
screen.input = false
end
screen.input = false
end
end
@@ -414,9 +432,10 @@ end
local function disable(screen, next_screen)
log("disable()", screen.id)
local next_is_popup = next_screen and next_screen.popup
run_coroutine(screen, nil, function()
change_context(screen)
release_input(screen)
release_input(screen, next_screen)
focus_lost(screen, next_screen)
if next_screen and next_screen.popup then
change_timestep(screen)
@@ -442,7 +461,7 @@ local function show_out(screen, next_screen, cb)
active_transition_count = active_transition_count + 1
notify_transition_listeners(M.SCREEN_TRANSITION_OUT_STARTED, { screen = screen.id, next_screen = next_screen.id })
change_context(screen)
release_input(screen)
release_input(screen, next_screen)
focus_lost(screen, next_screen)
reset_timestep(screen)
-- if the next screen is a popup we want the current screen to stay visible below the popup
@@ -512,7 +531,7 @@ local function back_out(screen, next_screen, cb)
notify_transition_listeners(M.SCREEN_TRANSITION_OUT_STARTED, { screen = screen.id, next_screen = next_screen and next_screen.id })
active_transition_count = active_transition_count + 1
change_context(screen)
release_input(screen)
release_input(screen, next_screen)
focus_lost(screen, next_screen)
if next_screen and screen.popup then
reset_timestep(next_screen)