Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arsenal - Fix sortPanel clearing custom item names (#8478)

Browse Source
This commit is contained in:
mharis001 2021-10-05 15:37:27 -04:00 committed by GitHub
parent 7347d563b1
commit 09d1284ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
addons/arsenal/functions/fnc_sortPanel.sqf
View File

@ -106,6 +106,8 @@ missionNamespace setVariable [
_sortConfig select 1 _sortConfig select 1
]; ];
private _originalNames = createHashMap;
private _for = if (_right) then { private _for = if (_right) then {
for '_i' from 0 to ((lnbSize _panel select 0) - 1) for '_i' from 0 to ((lnbSize _panel select 0) - 1)
} else { } else {
@ -123,7 +125,15 @@ _for do {
} else { } else {
0 0
}; };
private _itemCfg = _cfgClass >> _item; private _itemCfg = _cfgClass >> _item;
// In rare cases, item may not belong to the config class for the panel
// For example, misc items panel can contain CfgVehicles and CfgGlasses items in addition to the usual CfgWeapons items
if (isNull _itemCfg) then {
_itemCfg = _item call CBA_fnc_getItemConfig;
};
private _value = [_itemCfg, _item, _quantity] call _statement; private _value = [_itemCfg, _item, _quantity] call _statement;
if (_value isEqualType 0) then { if (_value isEqualType 0) then {
_value = [_value, 8] call CBA_fnc_formatNumber; _value = [_value, 8] call CBA_fnc_formatNumber;
@ -131,11 +141,18 @@ _for do {
if (_value isEqualTo "") then { if (_value isEqualTo "") then {
_value = "_"; _value = "_";
}; };
if (_right) then { if (_right) then {
_panel lnbSetText [[_i, 1], format ["%1%2", _value, _panel lnbText [_i, 1]]]; private _name = _panel lnbText [_i, 1];
_originalNames set [_item, _name];
_panel lnbSetText [[_i, 1], format ["%1%2", _value, _name]];
} else { } else {
if (_item isNotEqualTo "") then { if (_item isNotEqualTo "") then {
_panel lbSetText [_i, format ["%1%2", _value, _panel lbText _i]]; private _name = _panel lbText _i;
_originalNames set [_item, _name];
_panel lbSetText [_i, format ["%1%2", _value, _name]];
}; };
}; };
}; };
@ -145,22 +162,25 @@ if (_right) then {
_for do { _for do {
private _data = _panel lnbData [_i, 0]; private _data = _panel lnbData [_i, 0];
if (_cursel >= 0) then {
if (_data == _selected) then {_panel lnbSetCurSelRow _i}; if (_curSel >= 0 && {_data == _selected}) then {
_panel lnbSetCurSelRow _i;
}; };
_panel lnbSetText [[_i, 1], getText (_cfgClass >> _data >> "displayName")];
_panel lnbSetText [[_i, 1], _originalNames get _data];
}; };
} else { } else {
lbSort [_panel, "ASC"]; lbSort [_panel, "ASC"];
_for do { _for do {
private _data = _panel lbData _i; private _data = _panel lbData _i;
if (_cursel >= 0) then {
if (_data == _selected) then {_panel lbSetCurSel _i}; if (_curSel >= 0 && {_data == _selected}) then {
_panel lbSetCurSel _i;
}; };
private _name = getText (_cfgClass >> _data >> "displayName");
if (_name isNotEqualTo "") then { if (_data isNotEqualTo "") then {
_panel lbSetText [_i, _name]; _panel lbSetText [_i, _originalNames get _data];
}; };
}; };
}; };