From 842c08d16fdaf47262e8ebcfb2694482f5f16986 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Tue, 9 Jul 2019 17:20:01 +0200 Subject: [PATCH 1/3] Action button swapping --- code/_onclick/hud/action_button.dm | 32 +++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 15ed4429965..b70c98908f5 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -2,6 +2,25 @@ var/datum/action/linked_action screen_loc = null +/obj/screen/movable/action_button/MouseDrop(over_object) + if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle))) + if(locked) + to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") + closeToolTip(usr) + return + var/obj/screen/movable/action_button/B = over_object + var/list/actions = usr.actions + actions.Swap(actions.Find(linked_action), actions.Find(B.linked_action)) + moved = FALSE + B.moved = FALSE + closeToolTip(usr) + usr.update_action_buttons() + else if(istype(over_object, /obj/screen/movable/action_button/hide_toggle)) + closeToolTip(usr) + else + closeToolTip(usr) + return ..() + /obj/screen/movable/action_button/Click(location,control,params) var/list/modifiers = params2list(params) if(modifiers["shift"]) @@ -29,6 +48,13 @@ icon_state = "bg_default" var/hidden = 0 +/obj/screen/movable/action_button/hide_toggle/MouseDrop(over_object) + if(istype(over_object, /obj/screen/movable/action_button)) + closeToolTip(usr) + else + closeToolTip(usr) + return ..() + /obj/screen/movable/action_button/hide_toggle/Click(location,control,params) var/list/modifiers = params2list(params) if(modifiers["shift"]) @@ -83,9 +109,9 @@ var/image/img = image(icon, src, hidden ? "show" : "hide") overlays += img -/obj/screen/movable/action_button/MouseEntered(location,control,params) - openToolTip(usr,src,params,title = name,content = desc) - +/obj/screen/movable/action_button/MouseEntered(location, control, params) + if(!QDELETED(src)) + openToolTip(usr, src, params, title = name, content = desc) /obj/screen/movable/action_button/MouseExited() closeToolTip(usr) From d23da85b36a04c945f5ba425995b33605968107b Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Tue, 9 Jul 2019 22:01:56 +0200 Subject: [PATCH 2/3] Code cleanup --- code/_onclick/hud/action_button.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index b70c98908f5..ca4d6a5874f 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -6,19 +6,16 @@ if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle))) if(locked) to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") - closeToolTip(usr) return var/obj/screen/movable/action_button/B = over_object var/list/actions = usr.actions actions.Swap(actions.Find(linked_action), actions.Find(B.linked_action)) moved = FALSE B.moved = FALSE - closeToolTip(usr) usr.update_action_buttons() else if(istype(over_object, /obj/screen/movable/action_button/hide_toggle)) - closeToolTip(usr) + return else - closeToolTip(usr) return ..() /obj/screen/movable/action_button/Click(location,control,params) @@ -50,9 +47,8 @@ /obj/screen/movable/action_button/hide_toggle/MouseDrop(over_object) if(istype(over_object, /obj/screen/movable/action_button)) - closeToolTip(usr) + return else - closeToolTip(usr) return ..() /obj/screen/movable/action_button/hide_toggle/Click(location,control,params) From 9baaba4e01a2bec03e9024d8ae805bf934ae9474 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Tue, 9 Jul 2019 22:08:40 +0200 Subject: [PATCH 3/3] Revert "Code cleanup" This reverts commit d23da85b36a04c945f5ba425995b33605968107b. --- code/_onclick/hud/action_button.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index ca4d6a5874f..b70c98908f5 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -6,16 +6,19 @@ if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle))) if(locked) to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") + closeToolTip(usr) return var/obj/screen/movable/action_button/B = over_object var/list/actions = usr.actions actions.Swap(actions.Find(linked_action), actions.Find(B.linked_action)) moved = FALSE B.moved = FALSE + closeToolTip(usr) usr.update_action_buttons() else if(istype(over_object, /obj/screen/movable/action_button/hide_toggle)) - return + closeToolTip(usr) else + closeToolTip(usr) return ..() /obj/screen/movable/action_button/Click(location,control,params) @@ -47,8 +50,9 @@ /obj/screen/movable/action_button/hide_toggle/MouseDrop(over_object) if(istype(over_object, /obj/screen/movable/action_button)) - return + closeToolTip(usr) else + closeToolTip(usr) return ..() /obj/screen/movable/action_button/hide_toggle/Click(location,control,params)