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

Documentation

Browse Source
This commit is contained in:
Björn Ritzl
2023-03-29 11:10:49 +02:00
parent d8de338a46
commit 698cdba5a4
4 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
monarch/monarch.lua
View File

@@ -639,6 +639,7 @@ local function show_in(screen, previous_screen, reload, add_to_stack, wait_for_t
notify_transition_listeners(M.SCREEN_TRANSITION_FAILED, { screen = screen.id })
return
end
-- wait one frame so that the init() of any script have time to run before starting transitions
cowait(0)
reset_timestep(screen)
transition(screen, M.TRANSITION.SHOW_IN, { previous_screen = previous_screen and previous_screen.id }, wait_for_transition)
@@ -664,6 +665,8 @@ local function back_in(screen, previous_screen, wait_for_transition, cb)
notify_transition_listeners(M.SCREEN_TRANSITION_FAILED, { screen = screen.id })
return
end
-- wait one frame so that the init() of any script have time to run before starting transitions
cowait(0)
reset_timestep(screen)
if previous_screen and not previous_screen.popup then
transition(screen, M.TRANSITION.BACK_IN, { previous_screen = previous_screen.id }, wait_for_transition)