From 904140cc98694d8c2367b07c4e52b352ab2f52bf Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Sat, 30 May 2026 22:59:26 -0400 Subject: [PATCH 1/4] Update fnc_handleSearchbar.sqf --- addons/arsenal/functions/fnc_handleSearchbar.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_handleSearchbar.sqf b/addons/arsenal/functions/fnc_handleSearchbar.sqf index d5ff2dc69a0..b3198490bc3 100644 --- a/addons/arsenal/functions/fnc_handleSearchbar.sqf +++ b/addons/arsenal/functions/fnc_handleSearchbar.sqf @@ -61,7 +61,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then { _currentClassname = _rightPanelCtrl lbData _lbIndex; // Remove item in panel if it doesn't match search, skip otherwise - if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern)}}) then { + if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern) && {!(GVAR(searchMagazines) && _searchString in (compatibleMagazines _currentClassname))}}}) then { _rightPanelCtrl lbDelete _lbIndex; }; }; From 8fef76956205be16d25b87739d34ba3e9ba8c894 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Sat, 30 May 2026 23:17:43 -0400 Subject: [PATCH 2/4] blithering idiot --- addons/arsenal/functions/fnc_handleSearchbar.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_handleSearchbar.sqf b/addons/arsenal/functions/fnc_handleSearchbar.sqf index b3198490bc3..d5ff2dc69a0 100644 --- a/addons/arsenal/functions/fnc_handleSearchbar.sqf +++ b/addons/arsenal/functions/fnc_handleSearchbar.sqf @@ -61,7 +61,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then { _currentClassname = _rightPanelCtrl lbData _lbIndex; // Remove item in panel if it doesn't match search, skip otherwise - if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern) && {!(GVAR(searchMagazines) && _searchString in (compatibleMagazines _currentClassname))}}}) then { + if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern)}}) then { _rightPanelCtrl lbDelete _lbIndex; }; }; From 26088ce3ffafa90d4508dd03fe0fbd71385c2eef Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Sat, 30 May 2026 23:37:34 -0400 Subject: [PATCH 3/4] Update fnc_handleSearchbar.sqf --- addons/arsenal/functions/fnc_handleSearchbar.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_handleSearchbar.sqf b/addons/arsenal/functions/fnc_handleSearchbar.sqf index d5ff2dc69a0..997ad023d19 100644 --- a/addons/arsenal/functions/fnc_handleSearchbar.sqf +++ b/addons/arsenal/functions/fnc_handleSearchbar.sqf @@ -156,8 +156,10 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then { _currentDisplayName = _leftPanelCtrl lbText _lbIndex; _currentClassname = _leftPanelCtrl lbData _lbIndex; + if (_currentDisplayName isEqualTo format [" <%1>", localize "str_empty"]) then {continue}; + // Remove item in panel if it doesn't match search, skip otherwise - if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern)}}) then { + if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern) && {!(isClass (configFile >> "CfgMagazines" >> _searchString) && {_searchString in (compatibleMagazines _currentClassname)})}}}) then { _leftPanelCtrl lbDelete _lbIndex; }; }; From 6b882a262990ab34bb4cad3f9175f34bed182735 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Sun, 31 May 2026 13:43:05 -0400 Subject: [PATCH 4/4] Enhance search functionality for magazines in searchbar --- addons/arsenal/functions/fnc_handleSearchbar.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_handleSearchbar.sqf b/addons/arsenal/functions/fnc_handleSearchbar.sqf index 997ad023d19..a4b3bea0a9a 100644 --- a/addons/arsenal/functions/fnc_handleSearchbar.sqf +++ b/addons/arsenal/functions/fnc_handleSearchbar.sqf @@ -151,6 +151,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then { private _currentDisplayName = ""; private _currentClassname = ""; + private _isMagazine = isClass (configFile >> "CfgMagazines" >> _searchString); // Check if search term is a magazine for magazine lookups. Direct match is fine as user will ctrl+c the classname // Go through all items in panel and see if they need to be deleted or not for "_lbIndex" from (lbSize _leftPanelCtrl) - 1 to 0 step -1 do { _currentDisplayName = _leftPanelCtrl lbText _lbIndex; @@ -159,7 +160,7 @@ if ((ctrlIDC _control) == IDC_rightSearchbar) then { if (_currentDisplayName isEqualTo format [" <%1>", localize "str_empty"]) then {continue}; // Remove item in panel if it doesn't match search, skip otherwise - if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern) && {!(isClass (configFile >> "CfgMagazines" >> _searchString) && {_searchString in (compatibleMagazines _currentClassname)})}}}) then { + if ((_currentDisplayName == "") || {!(_currentDisplayName regexMatch _searchPattern) && {!(_currentClassname regexMatch _searchPattern) && {!_isMagazine && {_searchString in (compatibleMagazines _currentClassname)}}}}) then { _leftPanelCtrl lbDelete _lbIndex; }; };