Skip to content

Commit

Permalink
Medical GUI - Fix asymmetry in the medical menu (#9486)
Browse files Browse the repository at this point in the history 
* Fix assymmetry in the medical menu

* Add center divider in Activity/Quick View panel
  • Loading branch information
@amsteadrayle
amsteadrayle authored Oct 13, 2023
1 parent 503373b commit f774eaf
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion addons/medical_gui/functions/fnc_onMenuOpen.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private _countEnabled = {
if (_category isEqualType "") then { _x set [1, (GVAR(actions) findIf {_category == _x select 1}) > -1]; };
_x select 1
} count _list;
private _offsetX = POS_X(1.5) + 0.5 * (POS_X(12) - POS_X(_countEnabled * 1.5));
private _offsetX = POS_X(1.75) + 0.5 * (POS_X(12) - POS_X(_countEnabled * 1.5));
{
_x params ["_idc", "_enabled"];
private _ctrl = _display displayCtrl _idc;
Expand Down
57 changes: 32 additions & 25 deletions addons/medical_gui/gui.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class RscControlsGroupNoScrollbars;

class GVAR(BodyImage): RscControlsGroupNoScrollbars {
idc = IDC_BODY_GROUP;
x = QUOTE(POS_X(13.33));
x = QUOTE(POS_X(13.83));
y = QUOTE(POS_Y(2.73));
w = QUOTE(POS_W(12.33));
h = QUOTE(POS_H(12.33));
Expand Down Expand Up @@ -235,7 +235,7 @@ class ACE_Medical_Menu {
idc = -1;
style = ST_CENTER;
text = CSTRING(EXAMINE_TREATMENT);
x = QUOTE(POS_X(1));
x = QUOTE(POS_X(1.5));
y = QUOTE(POS_Y(1.5));
w = QUOTE(POS_W(12.33));
h = QUOTE(POS_H(1));
Expand All @@ -244,11 +244,12 @@ class ACE_Medical_Menu {
};
class StatusHeader: TreatmentHeader {
text = CSTRING(STATUS);
x = QUOTE(POS_X(13.33));
x = QUOTE(POS_X(13.83));
};
class OverviewHeader: TreatmentHeader {
text = CSTRING(OVERVIEW);
x = QUOTE(POS_X(25.66));
w = QUOTE(POS_W(12.34)); // 12.33 + 12.33 + 12.34 = 37.00
x = QUOTE(POS_X(26.16));
};
class HeaderLine: RscText {
idc = -1;
Expand All @@ -263,7 +264,7 @@ class ACE_Medical_Menu {
onButtonClick = QUOTE(GVAR(selectedCategory) = 'triage');
text = QPATHTOF(data\categories\triage_card.paa);
tooltip = CSTRING(ViewTriageCard);
x = QUOTE(POS_X(1.5));
x = QUOTE(POS_X(1.75));
y = QUOTE(POS_Y(2.73));
w = QUOTE(POS_W(1.5));
h = QUOTE(POS_H(1.5));
Expand All @@ -279,42 +280,42 @@ class ACE_Medical_Menu {
onButtonClick = QUOTE(GVAR(selectedCategory) = 'examine');
text = QPATHTOF(data\categories\examine_patient.paa);
tooltip = CSTRING(ExaminePatient);
x = QUOTE(POS_X(3));
x = QUOTE(POS_X(3.25));
};
class Bandage: Triage {
idc = IDC_BANDAGE;
onButtonClick = QUOTE(GVAR(selectedCategory) = 'bandage');
text = QPATHTOF(data\categories\bandage_fracture.paa);
tooltip = CSTRING(BandageFractures);
x = QUOTE(POS_X(4.5));
x = QUOTE(POS_X(4.75));
};
class Medication: Triage {
idc = IDC_MEDICATION;
onButtonClick = QUOTE(GVAR(selectedCategory) = 'medication');
text = QPATHTOF(data\categories\medication.paa);
tooltip = CSTRING(Medication);
x = QUOTE(POS_X(6));
x = QUOTE(POS_X(6.25));
};
class Airway: Triage {
idc = IDC_AIRWAY;
onButtonClick = QUOTE(GVAR(selectedCategory) = 'airway');
text = QPATHTOF(data\categories\airway_management.paa);
tooltip = CSTRING(AirwayManagement);
x = QUOTE(POS_X(7.5));
x = QUOTE(POS_X(7.75));
};
class Advanced: Triage {
idc = IDC_ADVANCED;
onButtonClick = QUOTE(GVAR(selectedCategory) = 'advanced');
text = QPATHTOF(data\categories\advanced_treatment.paa);
tooltip = CSTRING(AdvancedTreatment);
x = QUOTE(POS_X(9));
x = QUOTE(POS_X(9.25));
};
class Drag: Triage {
idc = IDC_DRAG;
onButtonClick = QUOTE(GVAR(selectedCategory) = 'drag');
text = QPATHTOF(data\categories\carry.paa);
tooltip = CSTRING(DragCarry);
x = QUOTE(POS_X(10.5));
x = QUOTE(POS_X(10.75));
};
class Toggle: Triage {
idc = IDC_TOGGLE;
Expand All @@ -326,7 +327,7 @@ class ACE_Medical_Menu {
idc = IDC_TRIAGE_CARD;
x = QUOTE(POS_X(1.5));
y = QUOTE(POS_Y(4.4));
w = QUOTE(POS_W(11.833));
w = QUOTE(POS_W(12.33));
h = QUOTE(POS_H(10));
sizeEx = QUOTE(POS_H(0.7));
colorSelect[] = {1, 1, 1, 1};
Expand All @@ -340,15 +341,15 @@ class ACE_Medical_Menu {
idc = IDC_ACTION_BUTTON_GROUP;
x = QUOTE(POS_X(1.5));
y = QUOTE(POS_Y(4.4));
w = QUOTE(POS_W(11.833));
w = QUOTE(POS_W(12.33));
h = QUOTE(POS_H(10));
};
class BodyImage: GVAR(BodyImage) {};
class SelectHead: RscButton {
idc = -1;
onButtonClick = QUOTE(GVAR(selectedBodyPart) = 0);
tooltip = CSTRING(SelectHead);
x = QUOTE(POS_X(18.8));
x = QUOTE(POS_X(19.3));
y = QUOTE(POS_Y(3.2));
w = QUOTE(POS_W(1.4));
h = QUOTE(POS_H(1.8));
Expand All @@ -359,40 +360,40 @@ class ACE_Medical_Menu {
class SelectTorso: SelectHead {
onButtonClick = QUOTE(GVAR(selectedBodyPart) = 1);
tooltip = CSTRING(SelectTorso);
x = QUOTE(POS_X(18.4));
x = QUOTE(POS_X(18.9));
y = QUOTE(POS_Y(5));
w = QUOTE(POS_W(2.2));
h = QUOTE(POS_H(3.8));
};
class SelectArmLeft: SelectHead {
onButtonClick = QUOTE(GVAR(selectedBodyPart) = 2);
tooltip = CSTRING(SelectLeftArm);
x = QUOTE(POS_X(20.6));
x = QUOTE(POS_X(21.1));
y = QUOTE(POS_Y(5.1));
w = QUOTE(POS_W(1.1));
h = QUOTE(POS_H(4.6));
};
class SelectArmRight: SelectArmLeft {
onButtonClick = QUOTE(GVAR(selectedBodyPart) = 3);
tooltip = CSTRING(SelectRightArm);
x = QUOTE(POS_X(17.4));
x = QUOTE(POS_X(17.8));
};
class SelectLegLeft: SelectHead {
onButtonClick = QUOTE(GVAR(selectedBodyPart) = 4);
tooltip = CSTRING(SelectLeftLeg);
x = QUOTE(POS_X(19.5));
x = QUOTE(POS_X(20.0));
y = QUOTE(POS_Y(8.8));
w = QUOTE(POS_W(1.1));
h = QUOTE(POS_H(5.8));
};
class SelectLegRight: SelectLegLeft {
onButtonClick = QUOTE(GVAR(selectedBodyPart) = 5);
tooltip = CSTRING(SelectRightLeg);
x = QUOTE(POS_X(18.4));
x = QUOTE(POS_X(18.9));
};
class Injuries: TriageCard {
idc = IDC_INJURIES;
x = QUOTE(POS_X(25.66));
x = QUOTE(POS_X(26.17));
w = QUOTE(POS_W(12.33));
};
class ActivityHeader: TreatmentHeader {
Expand All @@ -404,27 +405,33 @@ class ACE_Medical_Menu {
};
class QuickViewHeader: ActivityHeader {
text = CSTRING(QUICK_VIEW);
x = QUOTE(POS_X(19.5));
x = QUOTE(POS_X(20.0));
};
class LowerLine: HeaderLine {
y = QUOTE(POS_Y(18.5));
};
class LowerDivider: HeaderLine {
x = QUOTE(POS_X(19.985));
y = QUOTE(POS_Y(18.75));
w = QUOTE(POS_W(0.03));
h = QUOTE(POS_H(7.6));
};
class Activity: Injuries {
idc = IDC_ACTIVITY;
x = QUOTE(POS_X(1.5));
y = QUOTE(POS_Y(18.5));
w = QUOTE(POS_W(18.5));
h = QUOTE(POS_H(6.5));
h = QUOTE(POS_H(7.6));
colorBackground[] = {0, 0, 0, 0};
};
class QuickView: Activity {
idc = IDC_QUICKVIEW;
x = QUOTE(POS_X(21.5));
x = QUOTE(POS_X(20.0));
};
class TriageStatus: RscText {
idc = IDC_TRIAGE_STATUS;
style = ST_CENTER;
x = QUOTE(POS_X(13.33));
x = QUOTE(POS_X(13.83));
y = QUOTE(POS_Y(15.5));
w = QUOTE(POS_W(12.33));
h = QUOTE(POS_H(1.1));
Expand All @@ -437,7 +444,7 @@ class ACE_Medical_Menu {
style = ST_RIGHT;
text = CSTRING(BodyLabelLeft);
font = "RobotoCondensedBold";
x = QUOTE(POS_X(16.5));
x = QUOTE(POS_X(17.0));
y = QUOTE(POS_Y(10.5));
w = QUOTE(POS_W(6.0));
h = QUOTE(POS_H(2.0));
Expand Down

0 comments on commit f774eaf

Please sign in to comment.