Partydeck/Monarch-Extension
3
0
Fork 0
mirror of https://github.com/britzl/monarch.git synced 2025-06-27 10:27:49 +02:00
Code Issues Projects Releases Wiki Activity

Removed code duplication when loading

Browse Source
This commit is contained in:
Björn Ritzl 2018-07-27 09:48:59 +02:00
parent 8d1051f0fd
commit b73ed95315
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
monarch/monarch.lua
View File

@ -191,12 +191,27 @@ end
local function async_load(screen) local function async_load(screen)
log("async_load()", screen.id) log("async_load()", screen.id)
-- if the screen has been preloaded we need to enable it
if screen.preloaded then
log("show_in() screen was preloaded", screen.id)
msg.post(screen.proxy, ENABLE)
screen.loaded = true
screen.preloaded = false
-- the screen could be loaded if the previous screen was a popup
-- and the popup asked to show this screen again
-- in that case we shouldn't attempt to load it again
elseif not screen.loaded then
log("show_in() loading screen", screen.id)
screen.wait_for = PROXY_LOADED screen.wait_for = PROXY_LOADED
msg.post(screen.proxy, ASYNC_LOAD) msg.post(screen.proxy, ASYNC_LOAD)
coroutine.yield() coroutine.yield()
msg.post(screen.proxy, ENABLE) msg.post(screen.proxy, ENABLE)
screen.loaded = true screen.loaded = true
screen.wait_for = nil screen.wait_for = nil
else
log("show_in() screen already loaded", screen.id)
end
end end
local function transition(screen, message_id, message) local function transition(screen, message_id, message)
@ -308,19 +323,7 @@ local function show_in(screen, previous_screen, reload, cb)
log("show_in() reloading", screen.id) log("show_in() reloading", screen.id)
unload(screen) unload(screen)
end end
-- if the screen has been preloaded we need to enable it
if screen.preloaded then
log("show_in() screen was preloaded", screen.id)
msg.post(screen.proxy, ENABLE)
screen.loaded = true
screen.preloaded = false
-- the screen could be loaded if the previous screen was a popup
-- and the popup asked to show this screen again
-- in that case we shouldn't attempt to load it again
elseif not screen.loaded then
log("show_in() loading screen", screen.id)
async_load(screen) async_load(screen)
end
stack[#stack + 1] = screen stack[#stack + 1] = screen
reset_timestep(screen) reset_timestep(screen)
transition(screen, M.TRANSITION.SHOW_IN, { previous_screen = previous_screen and previous_screen.id }) transition(screen, M.TRANSITION.SHOW_IN, { previous_screen = previous_screen and previous_screen.id })
@ -342,15 +345,7 @@ local function back_in(screen, previous_screen, cb)
notify_listeners(M.SCREEN_TRANSITION_IN_STARTED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id }) notify_listeners(M.SCREEN_TRANSITION_IN_STARTED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
screen.co = co screen.co = co
change_context(screen) change_context(screen)
if screen.preloaded then
log("back_in() screen was preloaded", screen.id)
msg.post(screen.proxy, ENABLE)
screen.preloaded = false
screen.loaded = true
elseif not screen.loaded then
log("back_in() loading screen", screen.id)
async_load(screen) async_load(screen)
end
reset_timestep(screen) reset_timestep(screen)
if previous_screen and not previous_screen.popup then if previous_screen and not previous_screen.popup then
transition(screen, M.TRANSITION.BACK_IN, { previous_screen = previous_screen.id }) transition(screen, M.TRANSITION.BACK_IN, { previous_screen = previous_screen.id })