Arsenal - Improve stats display (#9290)

* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

addons/arsenal/functions/fnc_buttonStatsPage.sqf

@@ -20,11 +20,8 @@ params ["_display", "_control", "_nextPage"];
 TRACE_1("control enabled", ctrlEnabled _control);
 if !(ctrlEnabled _control) exitWith {};
 
-GVAR(statsInfo) params ["_isLeftPanel", "_statsIndex", "_panelControl", "_curSel", "_itemCfg"];
+GVAR(currentStatPage) = [GVAR(currentStatPage) - 1, GVAR(currentStatPage) + 1] select _nextPage;
 
-private _pageList = [GVAR(statsPagesRight), GVAR(statsPagesLeft)] select _isLeftPanel;
+GVAR(statsInfo) params ["_isLeftPanel", "_panelControl", "_curSel", "_itemCfg"];
-private _newPageNumber = [(_pageList select _statsIndex) - 1, (_pageList select _statsIndex) + 1] select _nextPage;
-
-_pageList set [_statsIndex, _newPageNumber];
 
 [QGVAR(displayStats), [_display, _panelControl, _curSel, _itemCfg]] call CBA_fnc_localEvent;

addons/arsenal/functions/fnc_compileStats.sqf

@@ -49,23 +49,6 @@ private _fnc_sortLists = {
     } forEach _tabsList;
 };
 
-// Group stats into groups of 5
-private _fnc_toStatsArray = {
-    params ["_tabsList", "_tabsListAll"];
-
-    private _stats = [];
-
-    {
-        _stats = [];
-
-        for "_index" from 0 to count _x - 1 step 5 do {
-            _stats pushBack (_x select [_index, _index + 5]);
-        };
-
-        _tabsList set [_forEachIndex, _stats];
-    } forEach _tabsList;
-};
-
 private _statsListLeftPanel = [
     [], // Primary 0
     [], // Handgun 1
@@ -144,10 +127,6 @@ private _priority = 0;
 [_statsListLeftPanel] call _fnc_sortLists;
 [_statsListRightPanel] call _fnc_sortLists;
 
-// Group into 5 stats
-[_statsListLeftPanel] call _fnc_toStatsArray;
-[_statsListRightPanel] call _fnc_toStatsArray;
-
 //------------------------- Config Handling
 GVAR(statsListLeftPanel) = _statsListLeftPanel;
 GVAR(statsListRightPanel) = _statsListRightPanel;

addons/arsenal/functions/fnc_handleStats.sqf

@@ -16,20 +16,21 @@
  * Public: No
 */
 
-params ["_display", "_control", "_curSel", "_itemCfg"];
+params ["_display", "_control", "_curSel", ["_itemCfg", configNull]];
 
 private _statsBoxCtrl = _display displayCtrl IDC_statsBox;
 private _statsPreviousPageCtrl = _display displayCtrl IDC_statsPreviousPage;
 private _statsNextPageCtrl = _display displayCtrl IDC_statsNextPage;
 private _statsCurrentPageCtrl = _display displayCtrl IDC_statsCurrentPage;
 
-private _hideUnusedFnc = {
+private _fnc_hideUnused = {
-    params ["_numbers"];
+    params ["_count"];
 
-    {
+    if (_count <= 0) exitWith {};
-        private _statsTitleCtrl = _display displayCtrl (IDC_statsTitle1 + ((_x - 1) * 4));
+    for "_i" from 0 to (_count - 1) do {
-        private _statsTitleIDC = ctrlIDC _statsTitleCtrl;
+        private _statsTitleIDC = IDC_statsTitle5 - (_i * 4);
 
+        private _statsTitleCtrl = _display displayCtrl _statsTitleIDC;
         private _statsBackgroundCtrl = _display displayCtrl (_statsTitleIDC + 1);
         private _statsBarCtrl = _display displayCtrl (_statsTitleIDC + 2);
         private _statsTextCtrl = _display displayCtrl (_statsTitleIDC + 3);
@@ -43,213 +44,25 @@ private _hideUnusedFnc = {
             _statsBarCtrl,
             _statsTextCtrl
         ];
-    } forEach _numbers;
+    };
 };
 
-if (!isNil "_itemCfg") then {
+private _fnc_hideEverything = {
-    private _handleStatsFnc = {
+    5 call _fnc_hideUnused;
-        params ["_statsIndex", "_leftPanel"];
 
-        // Get the proper list and page
+    // Hide the stats box
-        if (_leftPanel) then {
-            [(GVAR(statsListLeftPanel)) select _statsIndex, GVAR(statsPagesLeft) select _statsIndex]
-        } else {
-            [(GVAR(statsListRightPanel)) select _statsIndex, GVAR(statsPagesRight) select _statsIndex]
-        } params ["_statsArray", "_currentPage"];
-
-        private _statsList = _statsArray select _currentPage;
-        private _statsCount = 0;
-
-        // Handle titles, bars and text
-        _statsList = _statsList select [0, 5];
-
-        if (_statsList isNotEqualTo []) then {
-            private _statsTitleCtrl = controlNull;
-            private _statsTitleIDC = -1;
-            private _statsBackgroundCtrl = controlNull;
-            private _statsBarCtrl = controlNull;
-            private _statsTextCtrl = controlNull;
-            private _textStatementResult = "";
-
-            {
-                _x params ["_ID", "_configEntry", "_title", "_bools", "_statements"];
-                _bools params ["_showBar", "_showText"];
-                _statements params [["_barStatement", {}, [{}]], ["_textStatement", {}, [{}]], ["_condition", {true}, [{}]]];
-
-                _statsTitleCtrl = _display displayCtrl (IDC_statsTitle1 + _forEachIndex * 4);
-                _statsTitleIDC = ctrlIDC _statsTitleCtrl;
-                _statsBackgroundCtrl = _display displayCtrl (_statsTitleIDC + 1);
-                _statsBarCtrl = _display displayCtrl (_statsTitleIDC + 2);
-                _statsTextCtrl = _display displayCtrl (_statsTitleIDC + 3);
-
-                _statsCount = _statsCount + 1;
-                _statsTitleCtrl ctrlSetText _title;
-                _statsTitleCtrl ctrlSetFade 0;
-
-                // Handle bars
-                if (_showBar) then {
-                    _statsBarCtrl progressSetPosition ([_configEntry, _itemCfg] call _barStatement);
-                    _statsBackgroundCtrl ctrlSetFade 0;
-                    _statsBarCtrl ctrlSetFade 0;
-                } else {
-                    _statsBackgroundCtrl ctrlSetFade 1;
-                    _statsBarCtrl ctrlSetFade 1;
-                };
-
-                // Handle text entries
-                if (_showText) then {
-                    _textStatementResult = [_configEntry, _itemCfg] call _textStatement;
-
-                    if !(_textStatementResult isEqualtype "") then {
-                        _textStatementResult = str _textStatementResult;
-                    };
-
-                    _statsTextCtrl ctrlSetText _textStatementResult;
-                    _statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar));
-                    _statsTextCtrl ctrlSetFade 0;
-                } else {
-                    _statsTextCtrl ctrlSetFade 1;
-                };
-
-                {
-                    _x ctrlCommit 0;
-                } forEach [
-                    _statsTitleCtrl,
-                    _statsBackgroundCtrl,
-                    _statsBarCtrl,
-                    _statsTextCtrl
-                ];
-            } forEach (_statsList select {
-                _x params ["", "_configEntry", "", "", "_statements"];
-                _statements params ["", "", ["_condition", {true}, [{}]]];
-
-                ([_configEntry, _itemCfg] call _condition)
-            });
-        };
-
-        // Resize the window
-        [[1, 2, 3, 4, 5] select [_statsCount, 5]] call _hideUnusedFnc;
-        private _height = ([11, (10 * _statsCount) + 5] select (_statsCount > 0));
-        _statsBoxCtrl ctrlSetPosition [
-            (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
-            safezoneY + 1.8 * GRID_H,
-            47 * GRID_W,
-            _height * GRID_H
-        ];
-        _statsBoxCtrl ctrlCommit 0;
-        private _ctrl = _display displayCtrl IDC_actionsBox;
-        private _pos = ctrlPosition _ctrl;
-        _pos set [1, safezoneY + (_height + 3.6) * GRID_H];
-        _ctrl ctrlSetPosition _pos;
-        _ctrl ctrlCommit 0;
-
-
-        GVAR(statsInfo) = [_leftPanel, _statsIndex, _control, _curSel, _itemCfg];
-
-        // Toggle page buttons
-        _statsPreviousPageCtrl ctrlEnable (_currentPage > 0);
-        _statsNextPageCtrl ctrlEnable (_currentPage + 1 < count _statsArray);
-        _statsCurrentPageCtrl ctrlSetText ([LLSTRING(page), str (_currentPage + 1)] joinString " ");
-
-        {
-            _x ctrlSetFade 0;
-            _x ctrlCommit 0;
-        } forEach [
-            _statsPreviousPageCtrl,
-            _statsNextPageCtrl,
-            _statsCurrentPageCtrl
-        ];
-    };
-
-    // Check if in left or right panel
-    if (ctrlIDC _control == IDC_leftTabContent) then {
-        // Faces, voices and insigna do not have stats
-        if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsignia] find GVAR(currentLeftPanel) > -1) then {
-            [[1, 2, 3, 4, 5]] call _hideUnusedFnc;
-            _statsBoxCtrl ctrlSetPosition [
-                (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
-                safezoneY + 1.8 * GRID_H,
-                47 * GRID_W,
-                11 * GRID_H
-            ];
-            _statsBoxCtrl ctrlCommit 0;
-
-            {
-                _x ctrlSetFade 1;
-                _x ctrlCommit 0;
-            } forEach [
-                _statsPreviousPageCtrl,
-                _statsNextPageCtrl,
-                _statsCurrentPageCtrl
-            ];
-        } else {
-            [[
-                IDC_buttonPrimaryWeapon,
-                IDC_buttonHandgun,
-                IDC_buttonSecondaryWeapon,
-                IDC_buttonUniform,
-                IDC_buttonVest,
-                IDC_buttonBackpack,
-                IDC_buttonHeadgear,
-                IDC_buttonGoggles,
-                IDC_buttonNVG,
-                IDC_buttonBinoculars,
-                IDC_buttonMap,
-                IDC_buttonGPS,
-                IDC_buttonRadio,
-                IDC_buttonCompass,
-                IDC_buttonWatch
-            ] find GVAR(currentLeftPanel), true] call _handleStatsFnc;
-        };
-    } else {
-        switch (GVAR(currentRightPanel)) do {
-            case IDC_buttonOptic: {
-                [0, false] call _handleStatsFnc;
-            };
-            case IDC_buttonItemAcc: {
-                [1, false] call _handleStatsFnc;
-            };
-            case IDC_buttonMuzzle: {
-                [2, false] call _handleStatsFnc;
-            };
-            case IDC_buttonBipod: {
-                [3, false] call _handleStatsFnc;
-            };
-            case IDC_buttonCurrentMag;
-            case IDC_buttonCurrentMag2;
-            case IDC_buttonMag;
-            case IDC_buttonMagALL: {
-                [4, false] call _handleStatsFnc;
-            };
-            case IDC_buttonThrow: {
-                [5, false] call _handleStatsFnc;
-            };
-            case IDC_buttonPut: {
-                [6, false] call _handleStatsFnc;
-            };
-            case IDC_buttonMisc: {
-                [7, false] call _handleStatsFnc;
-            };
-            default {
-                if (GVAR(currentRightPanel) in [RIGHT_PANEL_CUSTOM_BUTTONS]) then {
-                    [7, false] call _handleStatsFnc;
-                };
-            };
-        };
-    };
-} else {
-    // If nothing is chosen, hide stats
-    [[1, 2, 3, 4, 5]] call _hideUnusedFnc;
     _statsBoxCtrl ctrlSetPosition [
         (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
         safezoneY + 1.8 * GRID_H,
-        47 * GRID_W,
+        0,
-        11 * GRID_H
+        0
     ];
     _statsBoxCtrl ctrlCommit 0;
+
+    // Move action display
     private _ctrl = _display displayCtrl IDC_actionsBox;
     private _pos = ctrlPosition _ctrl;
-    _pos set [1, safezoneY + (14.6) * GRID_H];
+    _pos set [1, safezoneY + 1.8 * GRID_H];
     _ctrl ctrlSetPosition _pos;
     _ctrl ctrlCommit 0;
 
@@ -262,3 +75,187 @@ if (!isNil "_itemCfg") then {
         _statsCurrentPageCtrl
     ];
 };
+
+// If nothing is chosen, hide stats
+if (isNull _itemCfg) exitWith {
+    call _fnc_hideEverything
+};
+
+private _fnc_handleStats = {
+    params ["_statsIndex", "_leftPanel"];
+
+    private _statsPanel = [GVAR(statsListRightPanel), GVAR(statsListLeftPanel)] select _leftPanel;
+
+    // Get all viable stats for this tab
+    private _statsTab = _statsPanel select _statsIndex select {
+        _x params ["", "_configEntry", "", "", "_statements"];
+        _statements params ["", "", ["_condition", {true}, [{}]]];
+
+        ([_configEntry, _itemCfg] call _condition)
+    };
+
+    // If there are no stats to show (unlikely), just hide everything
+    if (_statsTab isEqualTo []) exitWith {
+        call _fnc_hideEverything
+    };
+
+   GVAR(currentStatPage) = GVAR(currentStatPage) min floor ((count _statsTab) / 5); 
+    private _statsToDisplay = _statsTab select [GVAR(currentStatPage) * 5, 5];
+
+
+    private _statsCount = 0;
+
+    private _statsTitleCtrl = controlNull;
+    private _statsTitleIDC = -1;
+    private _statsBackgroundCtrl = controlNull;
+    private _statsBarCtrl = controlNull;
+    private _statsTextCtrl = controlNull;
+    private _textStatementResult = "";
+
+    {
+        _x params ["_ID", "_configEntry", "_title", "_bools", "_statements"];
+        _bools params ["_showBar", "_showText"];
+        _statements params [["_barStatement", {}, [{}]], ["_textStatement", {}, [{}]], ["_condition", {true}, [{}]]];
+
+        _statsTitleCtrl = _display displayCtrl (IDC_statsTitle1 + _forEachIndex * 4);
+        _statsTitleIDC = ctrlIDC _statsTitleCtrl;
+        _statsBackgroundCtrl = _display displayCtrl (_statsTitleIDC + 1);
+        _statsBarCtrl = _display displayCtrl (_statsTitleIDC + 2);
+        _statsTextCtrl = _display displayCtrl (_statsTitleIDC + 3);
+
+        _statsCount = _statsCount + 1;
+        _statsTitleCtrl ctrlSetText _title;
+        _statsTitleCtrl ctrlSetFade 0;
+
+        // Handle bars
+        if (_showBar) then {
+            _statsBarCtrl progressSetPosition ([_configEntry, _itemCfg] call _barStatement);
+            _statsBackgroundCtrl ctrlSetFade 0;
+            _statsBarCtrl ctrlSetFade 0;
+        } else {
+            _statsBackgroundCtrl ctrlSetFade 1;
+            _statsBarCtrl ctrlSetFade 1;
+        };
+
+        // Handle text entries
+        if (_showText) then {
+            _textStatementResult = [_configEntry, _itemCfg] call _textStatement;
+
+            if !(_textStatementResult isEqualtype "") then {
+                _textStatementResult = str _textStatementResult;
+            };
+
+            _statsTextCtrl ctrlSetText _textStatementResult;
+            _statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar));
+            _statsTextCtrl ctrlSetFade 0;
+        } else {
+            _statsTextCtrl ctrlSetFade 1;
+        };
+
+        {
+            _x ctrlCommit 0;
+        } forEach [
+            _statsTitleCtrl,
+            _statsBackgroundCtrl,
+            _statsBarCtrl,
+            _statsTextCtrl
+        ];
+    } forEach _statsToDisplay;
+
+
+    // Resize the window
+    (5 - _statsCount) call _fnc_hideUnused;
+    private _height = 10 * _statsCount + 5;
+    _statsBoxCtrl ctrlSetPosition [
+        (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
+        safezoneY + 1.8 * GRID_H,
+        47 * GRID_W,
+        _height * GRID_H
+    ];
+    _statsBoxCtrl ctrlCommit 0;
+
+    // Move the actions box
+    private _ctrl = _display displayCtrl IDC_actionsBox;
+    private _pos = ctrlPosition _ctrl;
+    _pos set [1, safezoneY + (_height + 3.6) * GRID_H];
+    _ctrl ctrlSetPosition _pos;
+    _ctrl ctrlCommit 0;
+
+
+    GVAR(statsInfo) = [_leftPanel, _control, _curSel, _itemCfg];
+
+    // Toggle page buttons
+    _statsPreviousPageCtrl ctrlEnable (GVAR(currentStatPage) > 0);
+    _statsNextPageCtrl ctrlEnable ((GVAR(currentStatPage) + 1) * 5 < count _statsTab);
+    _statsCurrentPageCtrl ctrlSetText ([LLSTRING(page), str (GVAR(currentStatPage) + 1)] joinString " ");
+
+    {
+        _x ctrlSetFade 0;
+        _x ctrlCommit 0;
+    } forEach [
+        _statsPreviousPageCtrl,
+        _statsNextPageCtrl,
+        _statsCurrentPageCtrl
+    ];
+};
+
+// Check if in left or right panel
+if (ctrlIDC _control == IDC_leftTabContent) then {
+    // Faces, voices and insigna do not have stats
+    if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsignia] find GVAR(currentLeftPanel) > -1) then {
+        call _fnc_hideEverything;
+    } else {
+        [[
+            IDC_buttonPrimaryWeapon,
+            IDC_buttonHandgun,
+            IDC_buttonSecondaryWeapon,
+            IDC_buttonUniform,
+            IDC_buttonVest,
+            IDC_buttonBackpack,
+            IDC_buttonHeadgear,
+            IDC_buttonGoggles,
+            IDC_buttonNVG,
+            IDC_buttonBinoculars,
+            IDC_buttonMap,
+            IDC_buttonGPS,
+            IDC_buttonRadio,
+            IDC_buttonCompass,
+            IDC_buttonWatch
+        ] find GVAR(currentLeftPanel), true] call _fnc_handleStats;
+    };
+} else {
+    switch (GVAR(currentRightPanel)) do {
+        case IDC_buttonOptic: {
+            [0, false] call _fnc_handleStats;
+        };
+        case IDC_buttonItemAcc: {
+            [1, false] call _fnc_handleStats;
+        };
+        case IDC_buttonMuzzle: {
+            [2, false] call _fnc_handleStats;
+        };
+        case IDC_buttonBipod: {
+            [3, false] call _fnc_handleStats;
+        };
+        case IDC_buttonCurrentMag;
+        case IDC_buttonCurrentMag2;
+        case IDC_buttonMag;
+        case IDC_buttonMagALL: {
+            [4, false] call _fnc_handleStats;
+        };
+        case IDC_buttonThrow: {
+            [5, false] call _fnc_handleStats;
+        };
+        case IDC_buttonPut: {
+            [6, false] call _fnc_handleStats;
+        };
+        case IDC_buttonMisc: {
+            [7, false] call _fnc_handleStats;
+        };
+        default {
+            if (GVAR(currentRightPanel) in [RIGHT_PANEL_CUSTOM_BUTTONS]) then {
+                [7, false] call _fnc_handleStats;
+            };
+        };
+    };
+};

addons/arsenal/functions/fnc_onArsenalClose.sqf

@@ -121,11 +121,11 @@ GVAR(currentInsignia) = nil;
 GVAR(currentAction) = nil;
 
 GVAR(showStats) = nil;
-GVAR(statsPagesLeft) = nil;
+GVAR(currentStatPage) = nil;
-GVAR(statsPagesRight) = nil;
 GVAR(statsInfo) =  nil;
 
 GVAR(showActions) = nil;
+GVAR(currentActionPage) = nil;
 
 GVAR(center) = nil;
 GVAR(centerNotPlayer) = nil;

addons/arsenal/functions/fnc_onArsenalOpen.sqf

@@ -86,9 +86,8 @@ GVAR(currentAction) = "Stand";
 GVAR(shiftState) = false;
 
 GVAR(showStats) = true;
-GVAR(statsPagesLeft) = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+GVAR(currentStatPage) = 0;
-GVAR(statsPagesRight) = [0, 0, 0, 0, 0, 0, 0, 0];
+GVAR(statsInfo) = [true, controlNull, nil, nil];
-GVAR(statsInfo) = [true, 0, controlNull, nil, nil];
 
 GVAR(showActions) = true;
 GVAR(currentActionPage) = 0;