From b54be029df352a75ba901d944540f770f30b7687 Mon Sep 17 00:00:00 2001 From: amsteadrayle <2516219+amsteadrayle@users.noreply.github.com> Date: Sat, 14 Oct 2023 19:27:57 -0400 Subject: [PATCH] Medical GUI - Move target name to middle header (#9483) * Switch "status" header to player name * Set title to "Medical Menu" * Remove unused STATUS strings * Switch to existing MedicalMenu string Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Revert "Remove unused STATUS strings" This reverts commit 62c1ced06a47826f7d05ce99c3ea518fc6cb4170. --------- Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> --- addons/medical_gui/functions/fnc_onMenuOpen.sqf | 4 ++-- addons/medical_gui/gui.hpp | 5 +++-- addons/medical_gui/script_component.hpp | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/medical_gui/functions/fnc_onMenuOpen.sqf b/addons/medical_gui/functions/fnc_onMenuOpen.sqf index 9785313739..e5d507907e 100644 --- a/addons/medical_gui/functions/fnc_onMenuOpen.sqf +++ b/addons/medical_gui/functions/fnc_onMenuOpen.sqf @@ -26,8 +26,8 @@ if (EGVAR(interact_menu,menuBackground) == 2) then {0 cutRsc [QEGVAR(interact_me [{setMousePosition _this}, _this] call CBA_fnc_execNextFrame; }, getMousePosition] call CBA_fnc_execNextFrame; -// Set target name as title -private _ctrlTitle = _display displayCtrl IDC_TITLE; +// Set middle header as target name +private _ctrlTitle = _display displayCtrl IDC_NAME; _ctrlTitle ctrlSetText ([GVAR(target)] call EFUNC(common,getName)); // Initially hide the triage select buttons diff --git a/addons/medical_gui/gui.hpp b/addons/medical_gui/gui.hpp index b2e83efcaa..872366ad24 100644 --- a/addons/medical_gui/gui.hpp +++ b/addons/medical_gui/gui.hpp @@ -210,6 +210,7 @@ class ACE_Medical_Menu { class controlsBackground { class Title: RscText { idc = IDC_TITLE; + text = CSTRING(MedicalMenu); x = QUOTE(POS_X(1)); y = QUOTE(POS_Y(0)); w = QUOTE(POS_W(38)); @@ -242,8 +243,8 @@ class ACE_Medical_Menu { sizeEx = QUOTE(POS_H(1.2)); colorText[] = {1, 1, 1, 0.9}; }; - class StatusHeader: TreatmentHeader { - text = CSTRING(STATUS); + class NameHeader: TreatmentHeader { + idc = IDC_NAME; x = QUOTE(POS_X(13.83)); }; class OverviewHeader: TreatmentHeader { diff --git a/addons/medical_gui/script_component.hpp b/addons/medical_gui/script_component.hpp index eb46b19aed..1887ed02a1 100644 --- a/addons/medical_gui/script_component.hpp +++ b/addons/medical_gui/script_component.hpp @@ -37,6 +37,7 @@ #define IDD_MEDICAL_MENU 38580 #define IDC_TITLE 1200 +#define IDC_NAME 1210 #define IDC_TRIAGE 1300 #define IDC_EXAMINE 1310 #define IDC_BANDAGE 1320