ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-27 02:49:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(DTR): make ordering a bit nicer

Browse source
This commit is contained in:
goaaats 2022-01-30 02:12:56 +01:00
parent 30d4c8a93d
commit bbbac0dc29
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
3 changed files with 45 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Interface/Internal/Windows/SettingsWindow.cs
View file

@ -324,8 +324,10 @@ namespace Dalamud.Interface.Internal.Windows
var configuration = Service<DalamudConfiguration>.Get();
var dtrBar = Service<DtrBar>.Get();
var order = configuration.DtrOrder!;
var ignore = configuration.DtrIgnore!;
var order = configuration.DtrOrder!.Where(x => dtrBar.HasEntry(x)).ToList();
var ignore = configuration.DtrIgnore!.Where(x => dtrBar.HasEntry(x)).ToList();
var orderLeft = configuration.DtrOrder!.Where(x => !order.Contains(x)).ToList();
var ignoreLeft = configuration.DtrIgnore!.Where(x => !ignore.Contains(x)).ToList();
if (order.Count == 0)
{
@ -336,8 +338,6 @@ namespace Dalamud.Interface.Internal.Windows
for (var i = 0; i < order.Count; i++)
{
var title = order[i];
if (!dtrBar.HasEntry(title))
continue;
// TODO: Maybe we can also resort the rest of the bar in the future?
// var isRequired = search is Configuration.SearchSetting.Internal or Configuration.SearchSetting.MacroLinks;
@ -397,8 +397,8 @@ namespace Dalamud.Interface.Internal.Windows
// }
}
configuration.DtrOrder = order;
configuration.DtrIgnore = ignore;
configuration.DtrOrder = order.Concat(orderLeft).ToList();
configuration.DtrIgnore = ignore.Concat(ignoreLeft).ToList();
if (isOrderChange)
dtrBar.ApplySort();