xevion/project-cybersyn
1
0
Fork 0
mirror of https://github.com/Xevion/project-cybersyn.git synced 2025-12-10 02:08:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix escape and E not closing the combinator GUI when the manager is enabled

Browse Source
This commit is contained in:
Patrick Wrobel
2023-06-23 02:07:16 -04:00
parent bfb417d0f5
commit 204ec6391b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cybersyn/scripts/gui.lua
View File

@@ -201,9 +201,6 @@ function gui_opened(comb, player)
combinator_update(global, comb, true) combinator_update(global, comb, true)
local rootgui = player.gui.screen local rootgui = player.gui.screen
if rootgui[COMBINATOR_NAME] then
rootgui[COMBINATOR_NAME].destroy()
end
local selected_index, signal, switch_state, bits = get_comb_gui_settings(comb) local selected_index, signal, switch_state, bits = get_comb_gui_settings(comb)
local _, main_window = flib_gui.add(rootgui, { local _, main_window = flib_gui.add(rootgui, {

9
cybersyn/scripts/gui/main.lua
View File

@@ -51,6 +51,15 @@ function manager_gui.on_lua_shortcut(e)
if e.element then if e.element then
if e.element.name == "manager_window" then if e.element.name == "manager_window" then
manager.wrapper(e, manager.handle.manager_toggle) manager.wrapper(e, manager.handle.manager_toggle)
elseif e.element.name == COMBINATOR_NAME and e.name == defines.events.on_gui_closed then
-- With the manager enabled, this handler overwrites the combinator's
-- on_gui_close handler. Copy the logic to close the combinator's GUI here
-- as well.
local player = game.get_player(e.player_index)
if not player then return end
if player.gui.screen[COMBINATOR_NAME] then
player.gui.screen[COMBINATOR_NAME].destroy()
end
end end
else else
manager.wrapper(e, manager.handle.manager_toggle) manager.wrapper(e, manager.handle.manager_toggle)