Arsenal - Cleanup action UI code

addons/arsenal/defines.hpp

@@ -489,3 +489,6 @@ if (!isNil QGVAR(customRightPanelButtons)) then {\
     _contentPanelCtrl lnbSetPicture [[_newRow, 7], getText (configFile >> "CfgVehicles" >> (_loadout select IDX_LOADOUT_BACKPACK) select 0 >> "picture")];\
     _contentPanelCtrl lnbSetPicture [[_newRow, 8], getText (_cfgWeapons >> _loadout select IDX_LOADOUT_HEADGEAR >> "picture")];\
     _contentPanelCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "CfgGlasses" >> _loadout select IDX_LOADOUT_GOGGLES >> "picture")];
+
+#define ACTION_TYPE_TEXT 0
+#define ACTION_TYPE_BUTTON 1

addons/arsenal/functions/fnc_addAction.sqf

@@ -1,4 +1,5 @@
 #include "..\script_component.hpp"
+#include "..\defines.hpp"
 /*
  * Author: johnb43
  * Adds custom action buttons.

addons/arsenal/functions/fnc_compileActions.sqf

@@ -1,4 +1,5 @@
 #include "..\script_component.hpp"
+#include "..\defines.hpp"
 /*
  * Author: Brett Mayson
  * Create the internal actions arrays when needed for the first time.

addons/arsenal/functions/fnc_handleActions.sqf

@@ -47,7 +47,7 @@ private _groups = (GVAR(actionList) select _panel) select {
 private _show = _groups isNotEqualTo [];
 private _actionsBoxCtrl = _display displayCtrl IDC_actionsBox;
 _actionsBoxCtrl ctrlShow _show;
-_actionsBoxCtrl ctrlCommit 0.15;
+_actionsBoxCtrl ctrlCommit FADE_DELAY;
 
 if (!_show) exitWith {};
 
@@ -77,44 +77,29 @@ private _items = _group select 3 select {
 };
 
 _actionsCurrentPageCtrl ctrlSetText (_group select 1);
-_actionsCurrentPageCtrl ctrlSetFade 0;
 _actionsCurrentPageCtrl ctrlShow true;
 _actionsCurrentPageCtrl ctrlCommit 0;
 
 private _activeCtrls = [];
 {
     _x params ["", "_type", "_label", "_statement"];
 
-    private _idc = IDC_actionsText1 + _forEachIndex * 2;
-    private _actionTextCtrl = _display displayCtrl _idc;
-    private _actionButtonCtrl = _display displayCtrl (_idc + 1);
+    private _idc = IDC_actionsText1 + _type + _forEachIndex * 2;
+    private _actionCtrl = _display displayCtrl _idc;
 
     switch (_type) do {
         case ACTION_TYPE_BUTTON: {
-            _actionButtonCtrl ctrlRemoveAllEventHandlers "ButtonClick";
-            _actionButtonCtrl ctrlAddEventHandler ["ButtonClick", {
+            _actionCtrl ctrlRemoveAllEventHandlers "ButtonClick";
+            _actionCtrl ctrlAddEventHandler ["ButtonClick", {
                 if (is3DEN) exitWith {[true] call FUNC(refresh)};
                 [{
                     [true] call FUNC(refresh);
                 }] call CBA_fnc_execNextFrame;
             }];
 
-            if (_activeCtrls isNotEqualTo []) then {
-                (ctrlPosition (_activeCtrls select -1)) params ["", "_lastPosY", "", "_lastPosH"];
-                _actionButtonCtrl ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H);
-            } else {
-                _actionButtonCtrl ctrlSetPositionY (6 * GRID_H);
-            };
-
-            _actionButtonCtrl ctrlAddEventHandler ["ButtonClick", _statement];
-            _actionButtonCtrl ctrlSetText _label;
-            _actionButtonCtrl ctrlSetFade 0;
-            _actionButtonCtrl ctrlEnable true;
-            _actionButtonCtrl ctrlCommit 0;
-            _actionTextCtrl ctrlSetFade 1;
-            _actionTextCtrl ctrlEnable false;
-            _actionTextCtrl ctrlCommit 0;
-            _activeCtrls pushBack _actionButtonCtrl;
+            _actionCtrl ctrlAddEventHandler ["ButtonClick", _statement];
+            _actionCtrl ctrlSetText _label;
+            _actionCtrl ctrlEnable true;
         };
         case ACTION_TYPE_TEXT: {
             private _text = call _statement;
@@ -125,47 +110,35 @@ private _activeCtrls = [];
             if (_text isEqualType []) then {
                 _text = _text joinString endl;
             };
-            if (_activeCtrls isNotEqualTo []) then {
-                (ctrlPosition (_activeCtrls select -1)) params ["", "_lastPosY", "", "_lastPosH"];
-                _actionTextCtrl ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H);
-            } else {
-                _actionTextCtrl ctrlSetPositionY (5 * GRID_H);
-            };
 
-            _actionTextCtrl ctrlSetText _text;
-            _actionTextCtrl ctrlSetPositionH (ctrlTextHeight _actionTextCtrl);
-            _actionTextCtrl ctrlSetFade 0;
-            _actionTextCtrl ctrlEnable false;
-            _actionTextCtrl ctrlCommit 0;
-            _actionButtonCtrl ctrlSetFade 1;
-            _actionButtonCtrl ctrlEnable false;
-            _actionButtonCtrl ctrlCommit 0;
-            _activeCtrls pushBack _actionTextCtrl;
-        };
-        default {
-            _actionTextCtrl ctrlSetFade 1;
-            _actionTextCtrl ctrlCommit 0;
-            _actionButtonCtrl ctrlSetFade 1;
-            _actionButtonCtrl ctrlEnable false;
-            _actionButtonCtrl ctrlCommit 0;
+            _actionCtrl ctrlSetText _text;
+            _actionCtrl ctrlSetPositionH (ctrlTextHeight _actionCtrl);
+            _actionCtrl ctrlEnable false;
         };
     };
-} forEach _items;
 
-private _actionCount = count _items;
+    if (_activeCtrls isNotEqualTo []) then {
+        (ctrlPosition (_activeCtrls select -1)) params ["", "_lastPosY", "", "_lastPosH"];
+        _actionCtrl ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H);
+    } else {
+        _actionCtrl ctrlSetPositionY ((5 + _type) * GRID_H);
+    };
+
+    _actionCtrl ctrlShow true;
+    _actionCtrl ctrlCommit 0;
+    _activeCtrls pushBack _actionCtrl;
+} forEach _items;
 
 {
-    private _idc = IDC_actionsText1 + _x * 2;
-    private _actionTextCtrl = _display displayCtrl _idc;
-    private _actionButtonCtrl = _display displayCtrl (_idc + 1);
+    private _idc = ctrlIDC _x;
+    if (_idc < IDC_actionsText1 || _idc > IDC_actionsButton5) then {continue};
 
-    _actionTextCtrl ctrlSetFade 1;
-    _actionTextCtrl ctrlCommit 0;
-    _actionButtonCtrl ctrlSetFade 1;
-    _actionButtonCtrl ctrlCommit 0;
-} forEach ([0, 1, 2, 3, 4] select [_actionCount, 5]);
+    _x ctrlShow false;
+    _x ctrlEnable false;
+    _x ctrlSetPositionY 0;
+    _x ctrlCommit 0;
+} forEach ((allControls _actionsBoxCtrl) select {!(_x in _activeCtrls)});
 
-private _pos = ctrlPosition _actionsBoxCtrl;
 (ctrlPosition (_activeCtrls select -1)) params ["", "_lastPosY", "", "_lastPosH"];
 private _actionsBoxHeight = _lastPosY + _lastPosH + GRID_H;
 _actionsBoxCtrl ctrlSetPositionH _actionsBoxHeight;

addons/arsenal/script_component.hpp

@@ -15,6 +15,3 @@
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
-
-#define ACTION_TYPE_BUTTON 0
-#define ACTION_TYPE_TEXT 1

addons/arsenal/ui/RscAttributes.hpp

@@ -467,7 +467,6 @@ class GVAR(display) {
                 };
                 class actionsText1: RscTextMulti {
                     idc = IDC_actionsText1;
-                    fade = 1;
                     x = QUOTE(0 * GRID_W);
                     y = QUOTE(5 * GRID_H);
                     w = QUOTE(45 * GRID_W);
@@ -479,8 +478,6 @@ class GVAR(display) {
                 };
                 class actionsButton1: ctrlButton {
                     idc = IDC_actionsButton1;
-                    onMouseEnter = QUOTE(ctrlSetFocus (_this select 0));
-                    fade = 1;
                     text = "";
                     x = QUOTE(1 * GRID_W);
                     y = QUOTE(6 * GRID_H);