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 sorting when using search (#7877)

Browse Source 
* fix sorting when using search

* remove unused line

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
Brett 2020-08-27 09:44:18 -06:00 committed by GitHub
parent 241f1aefbd
commit b51cf3575c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ missionNamespace setVariable [
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 {
for '_i' from 1 to (lbSize _panel - 1) for '_i' from 0 to (lbSize _panel - 1)
}; };
_for do { _for do {
@ -128,7 +128,9 @@ _for do {
if (_right) then { if (_right) then {
_panel lnbSetText [[_i, 1], format ["%1%2", _value, _panel lnbText [_i, 1]]]; _panel lnbSetText [[_i, 1], format ["%1%2", _value, _panel lnbText [_i, 1]]];
} else { } else {
_panel lbSetText [_i, format ["%1%2", _value, _panel lbText _i]]; if !(_item isEqualTo "") then {
_panel lbSetText [_i, format ["%1%2", _value, _panel lbText _i]];
};
}; };
}; };
@ -150,6 +152,9 @@ if (_right) then {
if (_cursel >= 0) then { if (_cursel >= 0) then {
if (_data == _selected) then {_panel lbSetCurSel _i}; if (_data == _selected) then {_panel lbSetCurSel _i};
}; };
_panel lbSetText [_i, getText (_cfgClass >> _data >> "displayName")]; private _name = getText (_cfgClass >> _data >> "displayName");
if !(_name isEqualTo "") then {
_panel lbSetText [_i, _name];
};
}; };
}; };

6
tools/build.py
View File

@ -46,15 +46,15 @@ def main():
failed = 0 failed = 0
skipped = 0 skipped = 0
removed = 0 removed = 0
for file in os.listdir(addonspath): for file in os.listdir(addonspath):
if os.path.isfile(file): if os.path.isfile(file):
if check_for_obsolete_pbos(addonspath, file): if check_for_obsolete_pbos(addonspath, file):
removed += 1 removed += 1
print(" Removing obsolete file => " + file) print(" Removing obsolete file => " + file)
os.remove(file) os.remove(file)
print("") print("")
for p in os.listdir(addonspath): for p in os.listdir(addonspath):
path = os.path.join(addonspath, p) path = os.path.join(addonspath, p)
if not os.path.isdir(path): if not os.path.isdir(path):