cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge SSnanoui & Nanomanager (#2427)

Browse Source 
Merges the NanoUI subsystem with Nanomanager, as well as cleans up some nanomanager code.
Most of the files in this commit are changed as a result of removing the nanomanager global in favor of the SSnanoui global.
This commit is contained in:
Lohikar
2017-05-23 08:33:00 -05:00
committed by skull132
parent 4d6d382967
commit 3be27b9efa
110 changed files with 449 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/modular_computers/computers/modular_computer/core.dm
View File

@@ -179,7 +179,7 @@
idle_threads.Add(active_program)
active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
nanomanager.close_uis(active_program.NM ? active_program.NM : active_program)
SSnanoui.close_uis(active_program.NM ? active_program.NM : active_program)
active_program = null
update_icon()
if(istype(user))
@@ -225,11 +225,11 @@
/obj/item/modular_computer/proc/update_uis()
if(active_program) //Should we update program ui or computer ui?
nanomanager.update_uis(active_program)
SSnanoui.update_uis(active_program)
if(active_program.NM)
nanomanager.update_uis(active_program.NM)
SSnanoui.update_uis(active_program.NM)
else
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
/obj/item/modular_computer/proc/check_update_ui_need()
var/ui_update_needed = 0

2
code/modules/modular_computers/computers/modular_computer/ui.dm
View File

@@ -37,7 +37,7 @@
programs.Add(list(program))
data["programs"] = programs
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "laptop_mainscreen.tmpl", "NTOS Main Menu", 400, 500)
ui.auto_update_layout = 1