ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 06:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: DTR toggling & reordering in settings window

Browse source
This commit is contained in:
goaaats 2022-01-29 04:44:52 +01:00
parent 35d5ca9a19
commit 597b7bb000
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
3 changed files with 166 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

81
Dalamud/Game/Gui/Dtr/DtrBar.cs
View file

@ -33,6 +33,11 @@ namespace Dalamud.Game.Gui.Dtr
public DtrBar()
{
Service<Framework>.Get().Update += this.Update;
var configuration = Service<DalamudConfiguration>.Get();
configuration.DtrOrder ??= new List<string>();
configuration.DtrIgnore ??= new List<string>();
configuration.Save();
}
/// <summary>
@ -75,6 +80,47 @@ namespace Dalamud.Game.Gui.Dtr
/// <returns>Whether or not an entry with that title is registered.</returns>
internal bool HasEntry(string title) => this.entries.Any(x => x.Title == title);
/// <summary>
/// Dirty the DTR bar entry with the specified title.
/// </summary>
/// <param name="title">Title of the entry to dirty.</param>
/// <returns>Whether the entry was found.</returns>
internal bool MakeDirty(string title)
{
var entry = this.entries.FirstOrDefault(x => x.Title == title);
if (entry == null)
return false;
entry.Dirty = true;
return true;
}
/// <summary>
/// Reapply the DTR entry ordering from <see cref="DalamudConfiguration"/>.
/// </summary>
internal void ApplySort()
{
var configuration = Service<DalamudConfiguration>.Get();
// Sort the current entry list, based on the order in the configuration.
var ordered = configuration.DtrOrder.Select(entry => this.entries.FirstOrDefault(x => x.Title == entry)).Where(value => value != null).ToList();
// Add entries that weren't sorted to the end of the list.
if (ordered.Count != this.entries.Count)
{
ordered.AddRange(this.entries.Where(x => ordered.All(y => y.Title != x.Title)));
}
// Update the order list for new entries.
configuration.DtrOrder.Clear();
foreach (var dtrEntry in ordered)
{
configuration.DtrOrder.Add(dtrEntry.Title);
}
this.entries = ordered;
}
private static AtkUnitBase* GetDtr() => (AtkUnitBase*)Service<GameGui>.Get().GetAddonByName("_DTR", 1).ToPointer();
private void Update(Framework unused)
@ -93,9 +139,12 @@ namespace Dalamud.Game.Gui.Dtr
var collisionNode = dtr->UldManager.NodeList[1];
var runningXPos = collisionNode->X;
var configuration = Service<DalamudConfiguration>.Get();
for (var i = 0; i < this.entries.Count; i++)
{
var data = this.entries[i];
var isHide = configuration.DtrIgnore!.Any(x => x == data.Title) || !data.Shown;
if (data.Dirty && data.Added && data.Text != null && data.TextNode != null)
{
@ -103,7 +152,7 @@ namespace Dalamud.Game.Gui.Dtr
node->SetText(data.Text?.Encode());
ushort w = 0, h = 0;
if (!data.Shown)
if (isHide)
{
node->AtkResNode.ToggleVisibility(false);
}
@ -122,7 +171,7 @@ namespace Dalamud.Game.Gui.Dtr
data.Added = this.AddNode(data.TextNode);
}
if (data.Shown)
if (!isHide)
{
runningXPos -= data.TextNode->AtkResNode.Width + ElementPadding;
data.TextNode->AtkResNode.SetPositionFloat(runningXPos, 2);
@ -213,33 +262,5 @@ namespace Dalamud.Game.Gui.Dtr
return newTextNode;
}
private void ApplySort()
{
var configuration = Service<DalamudConfiguration>.Get();
if (configuration.DtrOrder == null)
{
configuration.DtrOrder = new List<string>();
configuration.Save();
}
// Sort the current entry list, based on the order in the configuration.
var ordered = configuration.DtrOrder.Select(entry => this.entries.FirstOrDefault(x => x.Title == entry)).Where(value => value != null).ToList();
// Add entries that weren't sorted to the end of the list.
if (ordered.Count != this.entries.Count)
{
ordered.AddRange(this.entries.Where(x => ordered.All(y => y.Title != x.Title)));
}
// Update the order list for new entries.
configuration.DtrOrder.Clear();
foreach (var dtrEntry in ordered)
{
configuration.DtrOrder.Add(dtrEntry.Title);
}
this.entries = ordered;
}
}
}