OhKannaDuh/ARControl
1
0
Fork 0
forked from liza/ARControl
Code Pull Requests Activity

Update venture list item sorting

Browse Source
This commit is contained in:
Liza 2024-07-18 18:00:42 +02:00
parent ec56f22e36
commit c522574ab9
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 149 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ARControl/Configuration.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Dalamud.Configuration; using Dalamud.Configuration;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Newtonsoft.Json;
namespace ARControl; namespace ARControl;
@ -53,6 +54,9 @@ internal sealed class Configuration : IPluginConfiguration
public sealed class QueuedItem public sealed class QueuedItem
{ {
[JsonIgnore]
public Guid InternalId { get; } = Guid.NewGuid();
public required uint ItemId { get; set; } public required uint ItemId { get; set; }
public required int RemainingQuantity { get; set; } public required int RemainingQuantity { get; set; }
} }

262
ARControl/Windows/ConfigWindow.cs
View File

@ -50,6 +50,7 @@ internal sealed class ConfigWindow : LWindow
private readonly IPluginLog _pluginLog; private readonly IPluginLog _pluginLog;
private readonly Dictionary<Guid, TemporaryConfig> _currentEditPopups = new(); private readonly Dictionary<Guid, TemporaryConfig> _currentEditPopups = new();
private bool _shouldSave;
private string _searchString = string.Empty; private string _searchString = string.Empty;
private float _mainIndentSize = 1; private float _mainIndentSize = 1;
private TemporaryConfig _newGroup = new() { Name = string.Empty }; private TemporaryConfig _newGroup = new() { Name = string.Empty };
@ -105,6 +106,12 @@ internal sealed class ConfigWindow : LWindow
DrawGatheredItemsToCheck(); DrawGatheredItemsToCheck();
DrawMiscTab(); DrawMiscTab();
if (_shouldSave && !ImGui.IsMouseDown(ImGuiMouseButton.Left))
{
_pluginLog.Debug("Triggering delayed save");
Save();
}
ImGui.EndTabBar(); ImGui.EndTabBar();
} }
} }
@ -312,6 +319,118 @@ internal sealed class ConfigWindow : LWindow
private void DrawVentureListItemSelection(Configuration.ItemList list, IReadOnlySet<uint> itemsToDiscard) private void DrawVentureListItemSelection(Configuration.ItemList list, IReadOnlySet<uint> itemsToDiscard)
{ {
DrawVentureListItemFilter(list);
Configuration.QueuedItem? itemToRemove = null;
Configuration.QueuedItem? itemToAdd = null;
int indexToAdd = 0;
var dragDropData = CalculateDragDropData(list.Items.Count);
for (int i = 0; i < list.Items.Count; ++i)
{
var item = list.Items[i];
ImGui.PushID($"QueueItem{item.InternalId}");
var ventures = _gameCache.Ventures.Where(x => x.ItemId == item.ItemId).ToList();
var venture = ventures.First();
if (itemsToDiscard.Contains(venture.ItemId))
{
ImGui.PushFont(UiBuilder.IconFont);
var pos = ImGui.GetCursorPos();
ImGui.SetCursorPos(new Vector2(pos.X - ImGui.CalcTextSize(DiscardWarningPrefix).X - 5, pos.Y + 2));
ImGui.TextColored(ImGuiColors.DalamudYellow, DiscardWarningPrefix);
ImGui.SetCursorPos(pos);
ImGui.PopFont();
if (ImGui.IsItemHovered())
ImGui.SetTooltip("This item will be automatically discarded by 'Discard Helper'.");
}
IDalamudTextureWrap? icon = _iconCache.GetIcon(venture.IconId);
if (icon != null)
{
ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
ImGui.SameLine(0, ImGui.GetStyle().FramePadding.X);
}
ImGui.SetNextItemWidth(130 * ImGuiHelpers.GlobalScale);
int quantity = item.RemainingQuantity;
if (ImGui.InputInt($"{venture.Name} ({string.Join(" ", ventures.Select(x => x.CategoryName))})",
ref quantity, 100))
{
item.RemainingQuantity = quantity;
Save();
}
if (list.Items.Count > 1)
{
ImGui.PushFont(UiBuilder.IconFont);
ImGui.SameLine(ImGui.GetContentRegionAvail().X +
_mainIndentSize +
ImGui.GetStyle().WindowPadding.X -
ImGui.CalcTextSize(FontAwesomeIcon.ArrowsUpDown.ToIconString()).X -
ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
ImGui.GetStyle().FramePadding.X * 4 -
ImGui.GetStyle().ItemSpacing.X);
ImGui.PopFont();
ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown);
if (ImGui.IsItemActive() && ImGui.IsMouseDragging(ImGuiMouseButton.Left))
{
int newIndex = dragDropData.ItemPositions.FindIndex(x =>
ImGui.IsMouseHoveringRect(x.TopLeft, x.BottomRight, true));
if (newIndex != i && newIndex >= 0)
{
indexToAdd = newIndex;
itemToAdd = item;
}
}
ImGui.SameLine();
}
else
{
ImGui.PushFont(UiBuilder.IconFont);
ImGui.SameLine(ImGui.GetContentRegionAvail().X +
_mainIndentSize +
ImGui.GetStyle().WindowPadding.X -
ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
ImGui.GetStyle().FramePadding.X * 2);
ImGui.PopFont();
}
if (ImGuiComponents.IconButton($"##Remove{i}", FontAwesomeIcon.Times))
itemToRemove = item;
ImGui.PopID();
}
if (itemToRemove != null)
{
list.Items.Remove(itemToRemove);
Save();
}
if (itemToAdd != null)
{
_pluginLog.Information($"Updating {itemToAdd.ItemId} → {indexToAdd}");
list.Items.Remove(itemToAdd);
list.Items.Insert(indexToAdd, itemToAdd);
_shouldSave = true;
}
ImGui.Spacing();
List<Configuration.QueuedItem> clipboardItems = ParseClipboardItems();
ImportFromClipboardButton(list, clipboardItems);
RemoveFinishedItemsButton(list);
ImGui.Spacing();
}
private void DrawVentureListItemFilter(Configuration.ItemList list)
{
ImGuiEx.SetNextItemFullWidth(); ImGuiEx.SetNextItemFullWidth();
if (ImGui.BeginCombo($"##VentureSelection{list.Id}", "Add Venture...", ImGuiComboFlags.HeightLarge)) if (ImGui.BeginCombo($"##VentureSelection{list.Id}", "Add Venture...", ImGuiComboFlags.HeightLarge))
{ {
@ -381,123 +500,6 @@ internal sealed class ConfigWindow : LWindow
} }
ImGui.Spacing(); ImGui.Spacing();
Configuration.QueuedItem? itemToRemove = null;
Configuration.QueuedItem? itemToAdd = null;
int indexToAdd = 0;
for (int i = 0; i < list.Items.Count; ++i)
{
var item = list.Items[i];
ImGui.PushID($"QueueItem{i}");
var ventures = _gameCache.Ventures.Where(x => x.ItemId == item.ItemId).ToList();
var venture = ventures.First();
if (itemsToDiscard.Contains(venture.ItemId))
{
ImGui.PushFont(UiBuilder.IconFont);
var pos = ImGui.GetCursorPos();
ImGui.SetCursorPos(new Vector2(pos.X - ImGui.CalcTextSize(DiscardWarningPrefix).X - 5, pos.Y + 2));
ImGui.TextColored(ImGuiColors.DalamudYellow, DiscardWarningPrefix);
ImGui.SetCursorPos(pos);
ImGui.PopFont();
if (ImGui.IsItemHovered())
ImGui.SetTooltip("This item will be automatically discarded by 'Discard Helper'.");
}
IDalamudTextureWrap? icon = _iconCache.GetIcon(venture.IconId);
if (icon != null)
{
ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
ImGui.SameLine(0, ImGui.GetStyle().FramePadding.X);
}
ImGui.SetNextItemWidth(130 * ImGuiHelpers.GlobalScale);
int quantity = item.RemainingQuantity;
if (ImGui.InputInt($"{venture.Name} ({string.Join(" ", ventures.Select(x => x.CategoryName))})",
ref quantity, 100))
{
item.RemainingQuantity = quantity;
Save();
}
if (list.Items.Count > 1)
{
bool wrap = _configuration.ConfigUiOptions.WrapAroundWhenReordering;
ImGui.PushFont(UiBuilder.IconFont);
ImGui.SameLine(ImGui.GetContentRegionAvail().X +
_mainIndentSize +
ImGui.GetStyle().WindowPadding.X -
ImGui.CalcTextSize(FontAwesomeIcon.ArrowUp.ToIconString()).X -
ImGui.CalcTextSize(FontAwesomeIcon.ArrowDown.ToIconString()).X -
ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
ImGui.GetStyle().FramePadding.X * 6 -
ImGui.GetStyle().ItemSpacing.X);
ImGui.PopFont();
ImGui.BeginDisabled(i == 0 && !wrap);
if (ImGuiComponents.IconButton($"##Up{i}", FontAwesomeIcon.ArrowUp))
{
itemToAdd = item;
if (i > 0)
indexToAdd = i - 1;
else
indexToAdd = list.Items.Count - 1;
}
ImGui.EndDisabled();
ImGui.SameLine(0, 0);
ImGui.BeginDisabled(i == list.Items.Count - 1 && !wrap);
if (ImGuiComponents.IconButton($"##Down{i}", FontAwesomeIcon.ArrowDown))
{
itemToAdd = item;
if (i < list.Items.Count - 1)
indexToAdd = i + 1;
else
indexToAdd = 0;
}
ImGui.EndDisabled();
ImGui.SameLine();
}
else
{
ImGui.PushFont(UiBuilder.IconFont);
ImGui.SameLine(ImGui.GetContentRegionAvail().X +
_mainIndentSize +
ImGui.GetStyle().WindowPadding.X -
ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
ImGui.GetStyle().FramePadding.X * 2);
ImGui.PopFont();
}
if (ImGuiComponents.IconButton($"##Remove{i}", FontAwesomeIcon.Times))
itemToRemove = item;
ImGui.PopID();
}
if (itemToRemove != null)
{
list.Items.Remove(itemToRemove);
Save();
}
if (itemToAdd != null)
{
_pluginLog.Information($"Updating {itemToAdd.ItemId} → {indexToAdd}");
list.Items.Remove(itemToAdd);
list.Items.Insert(indexToAdd, itemToAdd);
Save();
}
ImGui.Spacing();
List<Configuration.QueuedItem> clipboardItems = ParseClipboardItems();
ImportFromClipboardButton(list, clipboardItems);
RemoveFinishedItemsButton(list);
ImGui.Spacing();
} }
private void ImportFromClipboardButton(Configuration.ItemList list, List<Configuration.QueuedItem> clipboardItems) private void ImportFromClipboardButton(Configuration.ItemList list, List<Configuration.QueuedItem> clipboardItems)
@ -1295,6 +1297,7 @@ internal sealed class ConfigWindow : LWindow
private void Save() private void Save()
{ {
_pluginInterface.SavePluginConfig(_configuration); _pluginInterface.SavePluginConfig(_configuration);
_shouldSave = false;
} }
/// <summary> /// <summary>
@ -1312,6 +1315,31 @@ internal sealed class ConfigWindow : LWindow
return Encoding.UTF8.GetString(ptr, byteCount); return Encoding.UTF8.GetString(ptr, byteCount);
} }
private DragDropData CalculateDragDropData(int itemCount)
{
float yDelta = ImGui.GetFrameHeight() + ImGui.GetStyle().ItemSpacing.Y;
var firstCursorPos = ImGui.GetCursorScreenPos() + new Vector2(-_mainIndentSize, -ImGui.GetStyle().ItemSpacing.Y / 2);
var lastCursorPos = new Vector2(
firstCursorPos.X + _mainIndentSize + ImGui.GetContentRegionAvail().X,
firstCursorPos.Y + yDelta * itemCount);
List<(Vector2 TopLeft, Vector2 BottomRight)> itemPositions = [];
for (int i = 0; i < itemCount; ++i)
{
Vector2 left = firstCursorPos;
Vector2 right = lastCursorPos with { Y = firstCursorPos.Y + yDelta - 1 };
itemPositions.Add((left, right));
firstCursorPos.Y += yDelta;
lastCursorPos.Y += yDelta;
}
return new DragDropData(itemPositions);
}
private sealed record DragDropData(List<(Vector2 TopLeft, Vector2 BottomRight)> ItemPositions);
private sealed class CheckedCharacter private sealed class CheckedCharacter
{ {
public CheckedCharacter(Configuration configuration, Configuration.CharacterConfiguration character, public CheckedCharacter(Configuration configuration, Configuration.CharacterConfiguration character,