From 4c6e26fd7149401768ab27be26d8f84c90e78de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Fri, 12 Jan 2024 08:31:48 +0100 Subject: [PATCH] Removed backward comp fix for monarch.back() --- example/advanced/confirm.gui_script | 2 +- example/advanced/popup.gui_script | 2 +- example/advanced/pregame.gui_script | 2 +- monarch/monarch.lua | 12 +----------- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/example/advanced/confirm.gui_script b/example/advanced/confirm.gui_script index 6505af5..e2d09a1 100644 --- a/example/advanced/confirm.gui_script +++ b/example/advanced/confirm.gui_script @@ -29,7 +29,7 @@ function on_input(self, action_id, action) end elseif gui.pick_node(self.no, action.x, action.y) then print("no") - monarch.back(function() + monarch.back(nil, nil, function() print("back from popup done") end) end diff --git a/example/advanced/popup.gui_script b/example/advanced/popup.gui_script index d60100d..f878e63 100644 --- a/example/advanced/popup.gui_script +++ b/example/advanced/popup.gui_script @@ -27,7 +27,7 @@ function on_input(self, action_id, action) end) elseif gui.pick_node(self.cancel, action.x, action.y) then print("cancel") - monarch.back(function() + monarch.back(nil, nil, function() print("back from popup done") end) elseif gui.pick_node(self.about, action.x, action.y) then diff --git a/example/advanced/pregame.gui_script b/example/advanced/pregame.gui_script index 695d3e5..0c5294d 100644 --- a/example/advanced/pregame.gui_script +++ b/example/advanced/pregame.gui_script @@ -19,7 +19,7 @@ function on_input(self, action_id, action) end) elseif gui.pick_node(self.back, action.x, action.y) then print("back") - monarch.back(function() + monarch.back(nil, nil, function() print("back from pregame done") end) end diff --git a/monarch/monarch.lua b/monarch/monarch.lua index 66719b5..85200cd 100644 --- a/monarch/monarch.lua +++ b/monarch/monarch.lua @@ -924,7 +924,7 @@ function M.hide(id, cb) log("hide() you can only hide the screen at the top of the stack", id) return false end - return M.back(id, cb) + return M.back(nil, nil, cb) else log("hide() queuing action", id) queue_action(function(action_done, action_error) @@ -986,16 +986,6 @@ end -- @param cb (function) - Optional callback to invoke when the previous screen is visible again function M.back(options, data, cb) log("back() queuing action") - -- backwards compatibility with old version M.back(data, cb) - -- case when back(data, cb) - if type(data) == "function" then - cb = data - data = options - options = nil - -- case when back(data, nil) - elseif options ~= nil and data == nil and cb == nil then - data = options - end queue_action(function(action_done) local callbacks = callback_tracker()