mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-18 05:32:58 +00:00
* Fixes issues with closing apps on tablets (#75117) ## About The Pull Request - Fixes background apps not reloading the UI - Standardizes opening/closing/backgrounding apps - Simplifies the way apps are closed instead of having 2 procs, one on the PC and one on the program, being named the same thing (wtf) - Removes program states. They existed so computers can know to update their UI every process tick, but since we now do this event based, this is no longer needed, which is good. - Replaces the 'forced' arg from kill_program as it was completely unused, with ``reload_ui``, which is now used to open the UI on close, and not to when we don't want it to. - Closing background apps no longer reloads the entire UI - Responding to an NT Message will no longer open the UI on your face. ## Why It's Good For The Game Closes https://github.com/tgstation/tgstation/issues/75046 Closes https://github.com/tgstation/tgstation/issues/75108 Makes tablet UIs more responsive and lag less, not checking if a program is closed every process to close it, and makes responding to messages not a hassle every time. Also makes the code easier to understand/read, ## Changelog 🆑 fix: Tablets' minimize apps feature works again. /🆑 * Fixes issues with closing apps on tablets * Update tablet.dm --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
223 lines
6.0 KiB
Plaintext
223 lines
6.0 KiB
Plaintext
/**
|
|
* update_tablet_open_uis
|
|
*
|
|
* Will search the user to see if they have the tablet open.
|
|
* If they don't, we'll open a new UI depending on the tab the tablet is meant to be on.
|
|
* If they do, we'll update the interface and title, then update all static data and re-send assets.
|
|
*
|
|
* This is best called when you're actually changing the app, as we don't check
|
|
* if we're swapping to the current UI repeatedly.
|
|
* Args:
|
|
* user - The person whose UI we're updating.
|
|
*/
|
|
/obj/item/modular_computer/proc/update_tablet_open_uis(mob/user)
|
|
var/datum/tgui/active_ui = SStgui.get_open_ui(user, src)
|
|
if(!active_ui)
|
|
if(active_program)
|
|
active_ui = new(user, src, active_program.tgui_id, active_program.filedesc)
|
|
else
|
|
active_ui = new(user, src, "NtosMain")
|
|
return active_ui.open()
|
|
|
|
if(active_program)
|
|
active_ui.interface = active_program.tgui_id
|
|
active_ui.title = active_program.filedesc
|
|
else
|
|
active_ui.interface = "NtosMain"
|
|
|
|
update_static_data(user, active_ui)
|
|
active_ui.send_assets()
|
|
|
|
/obj/item/modular_computer/interact(mob/user)
|
|
if(enabled)
|
|
ui_interact(user)
|
|
else
|
|
turn_on(user)
|
|
|
|
// Operates TGUI
|
|
/obj/item/modular_computer/ui_interact(mob/user, datum/tgui/ui)
|
|
if(!enabled || !user.can_read(src, READING_CHECK_LITERACY) || !use_power())
|
|
if(ui)
|
|
ui.close()
|
|
return
|
|
|
|
// Robots don't really need to see the screen, their wireless connection works as long as computer is on.
|
|
if(!screen_on && !issilicon(user))
|
|
if(ui)
|
|
ui.close()
|
|
return
|
|
|
|
if(honkvirus_amount > 0) // EXTRA annoying, huh!
|
|
honkvirus_amount--
|
|
playsound(src, 'sound/items/bikehorn.ogg', 30, TRUE)
|
|
|
|
ui = SStgui.try_update_ui(user, src, ui)
|
|
if(!ui)
|
|
update_tablet_open_uis(user)
|
|
|
|
/obj/item/modular_computer/ui_assets(mob/user)
|
|
var/list/data = list()
|
|
data += get_asset_datum(/datum/asset/simple/headers)
|
|
if(active_program)
|
|
data += active_program.ui_assets(user)
|
|
return data
|
|
|
|
/obj/item/modular_computer/ui_static_data(mob/user)
|
|
var/list/data = list()
|
|
if(active_program)
|
|
data += active_program.ui_static_data(user)
|
|
return data
|
|
|
|
data["show_imprint"] = istype(src, /obj/item/modular_computer/pda)
|
|
return data
|
|
|
|
/obj/item/modular_computer/ui_data(mob/user)
|
|
var/list/data = get_header_data()
|
|
if(active_program)
|
|
data += active_program.ui_data(user)
|
|
return data
|
|
|
|
data["pai"] = inserted_pai
|
|
data["has_light"] = has_light
|
|
data["light_on"] = light_on
|
|
data["comp_light_color"] = comp_light_color
|
|
|
|
data["login"] = list(
|
|
IDName = saved_identification || "Unknown",
|
|
IDJob = saved_job || "Unknown",
|
|
)
|
|
|
|
data["proposed_login"] = list(
|
|
IDName = computer_id_slot?.registered_name,
|
|
IDJob = computer_id_slot?.assignment,
|
|
)
|
|
|
|
data["removable_media"] = list()
|
|
if(inserted_disk)
|
|
data["removable_media"] += "Eject Disk"
|
|
var/datum/computer_file/program/ai_restorer/airestore_app = locate() in stored_files
|
|
if(airestore_app?.stored_card)
|
|
data["removable_media"] += "intelliCard"
|
|
|
|
data["programs"] = list()
|
|
for(var/datum/computer_file/program/program in stored_files)
|
|
data["programs"] += list(list(
|
|
"name" = program.filename,
|
|
"desc" = program.filedesc,
|
|
"header_program" = program.header_program,
|
|
"running" = !!(program in idle_threads),
|
|
"icon" = program.program_icon,
|
|
"alert" = program.alert_pending,
|
|
))
|
|
|
|
return data
|
|
|
|
// Handles user's GUI input
|
|
/obj/item/modular_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
|
|
if(ishuman(usr) && !allow_chunky)
|
|
var/mob/living/carbon/human/human_user = usr
|
|
if(human_user.check_chunky_fingers())
|
|
balloon_alert(human_user, "fingers are too big!")
|
|
return TRUE
|
|
|
|
switch(action)
|
|
if("PC_exit")
|
|
active_program.kill_program()
|
|
return TRUE
|
|
if("PC_shutdown")
|
|
shutdown_computer()
|
|
return TRUE
|
|
if("PC_minimize")
|
|
if(!active_program)
|
|
return
|
|
active_program.background_program()
|
|
return TRUE
|
|
|
|
if("PC_killprogram")
|
|
var/prog = params["name"]
|
|
var/datum/computer_file/program/killed_program = find_file_by_name(prog)
|
|
|
|
if(!istype(killed_program))
|
|
return
|
|
|
|
killed_program.kill_program()
|
|
to_chat(usr, span_notice("Program [killed_program.filename].[killed_program.filetype] with PID [rand(100,999)] has been killed."))
|
|
return TRUE
|
|
|
|
if("PC_runprogram")
|
|
open_program(usr, find_file_by_name(params["name"]))
|
|
return TRUE
|
|
|
|
if("PC_toggle_light")
|
|
toggle_flashlight()
|
|
return TRUE
|
|
|
|
if("PC_light_color")
|
|
var/mob/user = usr
|
|
var/new_color
|
|
while(!new_color)
|
|
new_color = input(user, "Choose a new color for [src]'s flashlight.", "Light Color",light_color) as color|null
|
|
if(!new_color)
|
|
return
|
|
if(is_color_dark(new_color, 50) ) //Colors too dark are rejected
|
|
to_chat(user, span_warning("That color is too dark! Choose a lighter one."))
|
|
new_color = null
|
|
set_flashlight_color(new_color)
|
|
return TRUE
|
|
|
|
if("PC_Eject_Disk")
|
|
var/param = params["name"]
|
|
var/mob/user = usr
|
|
switch(param)
|
|
if("Eject Disk")
|
|
if(!inserted_disk)
|
|
return
|
|
|
|
user.put_in_hands(inserted_disk)
|
|
inserted_disk = null
|
|
playsound(src, 'sound/machines/card_slide.ogg', 50)
|
|
return TRUE
|
|
|
|
if("intelliCard")
|
|
var/datum/computer_file/program/ai_restorer/airestore_app = locate() in stored_files
|
|
if(!airestore_app)
|
|
return
|
|
|
|
if(airestore_app.try_eject(user))
|
|
playsound(src, 'sound/machines/card_slide.ogg', 50)
|
|
return TRUE
|
|
|
|
if("ID")
|
|
if(RemoveID(user))
|
|
playsound(src, 'sound/machines/card_slide.ogg', 50)
|
|
return TRUE
|
|
|
|
if("PC_Imprint_ID")
|
|
saved_identification = computer_id_slot.registered_name
|
|
saved_job = computer_id_slot.assignment
|
|
UpdateDisplay()
|
|
playsound(src, 'sound/machines/terminal_processing.ogg', 15, TRUE)
|
|
|
|
if("PC_Pai_Interact")
|
|
switch(params["option"])
|
|
if("eject")
|
|
usr.put_in_hands(inserted_pai)
|
|
to_chat(usr, span_notice("You remove [inserted_pai] from the [name]."))
|
|
inserted_pai = null
|
|
update_appearance(UPDATE_ICON)
|
|
if("interact")
|
|
inserted_pai.attack_self(usr)
|
|
return TRUE
|
|
|
|
if(active_program)
|
|
return active_program.ui_act(action, params, ui, state)
|
|
|
|
/obj/item/modular_computer/ui_host()
|
|
if(physical)
|
|
return physical
|
|
return src
|