mirror of
https://github.com/britzl/monarch.git
synced 2025-11-27 19:30:54 +01:00
Compare commits
1 Commits
dev-back-t
...
3.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e81b3a327 |
@@ -604,9 +604,6 @@ local function show_in(screen, previous_screen, reload, add_to_stack, wait_for_t
|
|||||||
notify_transition_listeners(M.SCREEN_TRANSITION_FAILED, { screen = screen.id })
|
notify_transition_listeners(M.SCREEN_TRANSITION_FAILED, { screen = screen.id })
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- wait until screen has had a chance to render
|
|
||||||
cowait(0)
|
|
||||||
cowait(0)
|
|
||||||
reset_timestep(screen)
|
reset_timestep(screen)
|
||||||
transition(screen, M.TRANSITION.SHOW_IN, { previous_screen = previous_screen and previous_screen.id }, wait_for_transition)
|
transition(screen, M.TRANSITION.SHOW_IN, { previous_screen = previous_screen and previous_screen.id }, wait_for_transition)
|
||||||
screen.visible = true
|
screen.visible = true
|
||||||
@@ -631,9 +628,6 @@ local function back_in(screen, previous_screen, wait_for_transition, cb)
|
|||||||
notify_transition_listeners(M.SCREEN_TRANSITION_FAILED, { screen = screen.id })
|
notify_transition_listeners(M.SCREEN_TRANSITION_FAILED, { screen = screen.id })
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- wait until screen has had a chance to render
|
|
||||||
cowait(0)
|
|
||||||
cowait(0)
|
|
||||||
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 }, wait_for_transition)
|
transition(screen, M.TRANSITION.BACK_IN, { previous_screen = previous_screen.id }, wait_for_transition)
|
||||||
|
|||||||
Reference in New Issue
Block a user