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 - Search fixes (#9668)

Browse Source 
Arsenal search fixes
This commit is contained in:
johnb432 2023-12-03 02:48:35 +01:00 committed by GitHub
parent aa48e87323
commit acca95d204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
addons/arsenal/functions/fnc_fillRightPanel.sqf
View File

@ -114,15 +114,9 @@ private _fnc_fillRightContainer = {
private _ctrlPanel = _display displayCtrl IDC_rightTabContent; private _ctrlPanel = _display displayCtrl IDC_rightTabContent;
private _listnBox = _display displayCtrl IDC_rightTabContentListnBox; private _listnBox = _display displayCtrl IDC_rightTabContentListnBox;
// Reset right panel content
lbClear _ctrlPanel;
lbClear _listnBox;
_ctrlPanel lbSetCurSel -1;
_listnBox lbSetCurSel -1;
// Retrieve compatible items // Retrieve compatible items
private _itemToCheck = ""; private _isContainer = false;
private _selectedItem = "";
private _compatibleItems = []; private _compatibleItems = [];
private _compatibleMagsMuzzle = []; private _compatibleMagsMuzzle = [];
private _compatibleMagsAll = createHashMap; private _compatibleMagsAll = createHashMap;
@ -154,12 +148,12 @@ switch (GVAR(currentLeftPanel)) do {
// Check if weapon attachement or magazine // Check if weapon attachement or magazine
if (_index != -1) then { if (_index != -1) then {
_itemToCheck = (GVAR(currentItems) select _currentWeaponItemsIndex) select _index; _selectedItem = (GVAR(currentItems) select _currentWeaponItemsIndex) select _index;
// If weapon attachment, get base weapon; Get compatible items // If weapon attachment, get base weapon; Get compatible items
if (_index <= 3) then { if (_index <= 3) then {
_compatibleItems = compatibleItems _weapon; _compatibleItems = compatibleItems _weapon;
_itemToCheck = _itemToCheck call FUNC(baseWeapon); _selectedItem = _selectedItem call FUNC(baseWeapon);
} else { } else {
// Get compatible magazines for primary & secondary muzzle (secondary muzzle is not guaranteed to exist) // Get compatible magazines for primary & secondary muzzle (secondary muzzle is not guaranteed to exist)
// Assumption: One weapon can have two muzzles maximum // Assumption: One weapon can have two muzzles maximum
@ -171,7 +165,15 @@ switch (GVAR(currentLeftPanel)) do {
case IDC_buttonUniform; case IDC_buttonUniform;
case IDC_buttonVest; case IDC_buttonVest;
case IDC_buttonBackpack: { case IDC_buttonBackpack: {
_ctrlPanel = _listnBox; _isContainer = true;
// Get the currently selected item in panel
private _selectedItemIndex = lnbCurSelRow _listnBox;
// If something is selected, save it
if (_selectedItemIndex != -1) then {
_selectedItem = _listnBox lnbData [_selectedItemIndex, 0];
};
// This is for the "compatible magazines" tab when a container is open // This is for the "compatible magazines" tab when a container is open
if (_ctrlIDC == IDC_buttonMag) then { if (_ctrlIDC == IDC_buttonMag) then {
@ -183,6 +185,17 @@ switch (GVAR(currentLeftPanel)) do {
}; };
}; };
// Reset right panel content
lbClear _ctrlPanel;
lnbClear _listnBox;
_ctrlPanel lbSetCurSel -1;
_listnBox lnbSetCurSelRow -1;
if (_isContainer) then {
_ctrlPanel = _listnBox;
};
// Force a "refresh" animation of the panel // Force a "refresh" animation of the panel
if (_animate) then { if (_animate) then {
_ctrlPanel ctrlSetFade 1; _ctrlPanel ctrlSetFade 1;
@ -368,7 +381,7 @@ GVAR(currentRightPanel) = _ctrlIDC;
[QGVAR(rightPanelFilled), [_display, GVAR(currentLeftPanel), _ctrlIDC]] call CBA_fnc_localEvent; [QGVAR(rightPanelFilled), [_display, GVAR(currentLeftPanel), _ctrlIDC]] call CBA_fnc_localEvent;
// Add current items, change progress bar of container load and get relevant container // Add current items, change progress bar of container load and get relevant container
if (GVAR(currentLeftPanel) in [IDC_buttonUniform, IDC_buttonVest, IDC_buttonBackpack]) then { if (_isContainer) then {
private _containerItems = []; private _containerItems = [];
private _container = switch (GVAR(currentLeftPanel)) do { private _container = switch (GVAR(currentLeftPanel)) do {
// Uniform // Uniform
@ -415,17 +428,34 @@ if (GVAR(currentLeftPanel) in [IDC_buttonUniform, IDC_buttonVest, IDC_buttonBack
// Sorting // Sorting
[_display, _control, _display displayCtrl IDC_sortRightTab, _display displayCtrl IDC_sortRightTabDirection] call FUNC(fillSort); [_display, _control, _display displayCtrl IDC_sortRightTab, _display displayCtrl IDC_sortRightTabDirection] call FUNC(fillSort);
// Try to select previously selected item again, otherwise select first item ("Empty") if (_selectedItem != "") then {
if (_itemToCheck != "") then { if (_isContainer) then {
private _index = 0; // Try to select previously selected item again, otherwise select nothing
private _index = -1;
for "_lbIndex" from 0 to (lbSize _ctrlPanel) - 1 do { for "_lbIndex" from 0 to (lnbSize _ctrlPanel select 0) - 1 do {
if ((_ctrlPanel lbData _lbIndex) == _itemToCheck) exitWith { if ((_ctrlPanel lnbData [_lbIndex, 0]) == _selectedItem) exitWith {
_index = _lbIndex; _index = _lbIndex;
};
}; };
};
_ctrlPanel lbSetCurSel _index; _ctrlPanel lnbSetCurSelRow _index;
} else {
// Try to select previously selected item again, otherwise select first item ("Empty")
private _index = 0;
for "_lbIndex" from 0 to (lbSize _ctrlPanel) - 1 do {
if ((_ctrlPanel lbData _lbIndex) == _selectedItem) exitWith {
_index = _lbIndex;
};
};
_ctrlPanel lbSetCurSel _index;
};
} else { } else {
_ctrlPanel lbSetCurSel 0; if (_isContainer) then {
_ctrlPanel lnbSetCurSelRow -1; // select nothing
} else {
_ctrlPanel lbSetCurSel 0; // select "Empty"
};
}; };

12
addons/arsenal/functions/fnc_handleSearchbar.sqf
View File

@ -49,7 +49,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then {
// If something is selected, save it // If something is selected, save it
if (_selectedItemIndex != -1) then { if (_selectedItemIndex != -1) then {
_selectedItem = _rightPanelCtrl lbText _selectedItemIndex; _selectedItem = _rightPanelCtrl lbData _selectedItemIndex;
}; };
private _currentDisplayName = ""; private _currentDisplayName = "";
@ -72,7 +72,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then {
// Try to find previously selected item in panel // Try to find previously selected item in panel
for "_lbIndex" from 0 to (lbSize _rightPanelCtrl) - 1 do { for "_lbIndex" from 0 to (lbSize _rightPanelCtrl) - 1 do {
if ((_rightPanelCtrl lbText _lbIndex) == _selectedItem) exitWith { if ((_rightPanelCtrl lbData _lbIndex) == _selectedItem) exitWith {
_index = _lbIndex; _index = _lbIndex;
}; };
}; };
@ -89,7 +89,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then {
// If something is selected, save it // If something is selected, save it
if (_selectedItemIndex != -1) then { if (_selectedItemIndex != -1) then {
_selectedItem = _rightPanelCtrl lnbText [_selectedItemIndex, 1]; _selectedItem = _rightPanelCtrl lnbData [_selectedItemIndex, 0];
}; };
private _currentDisplayName = ""; private _currentDisplayName = "";
@ -112,7 +112,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then {
// Try to find previously selected item in panel // Try to find previously selected item in panel
for "_lbIndex" from 0 to (lnbSize _rightPanelCtrl select 0) - 1 do { for "_lbIndex" from 0 to (lnbSize _rightPanelCtrl select 0) - 1 do {
if ((_rightPanelCtrl lnbText [_lbIndex, 1]) == _selectedItem) exitWith { if ((_rightPanelCtrl lnbData [_lbIndex, 0]) == _selectedItem) exitWith {
_index = _lbIndex; _index = _lbIndex;
}; };
}; };
@ -145,7 +145,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then {
// If something is selected, save it // If something is selected, save it
if (_selectedItemIndex != -1) then { if (_selectedItemIndex != -1) then {
_selectedItem = _leftPanelCtrl lbText _selectedItemIndex; _selectedItem = _leftPanelCtrl lbData _selectedItemIndex;
}; };
private _currentDisplayName = ""; private _currentDisplayName = "";
@ -167,7 +167,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then {
private _index = -1; private _index = -1;
for "_lbIndex" from 0 to (lbSize _leftPanelCtrl) - 1 do { for "_lbIndex" from 0 to (lbSize _leftPanelCtrl) - 1 do {
if ((_leftPanelCtrl lbText _lbIndex) == _selectedItem) exitWith { if ((_leftPanelCtrl lbData _lbIndex) == _selectedItem) exitWith {
_index = _lbIndex; _index = _lbIndex;
}; };
}; };