ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add re-ordering of individual collections back.

Browse source
This commit is contained in:
Ottermandias 2023-04-29 15:15:55 +02:00
parent 648286a923
commit 73b4787a55
1 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Penumbra/UI/CollectionTab/CollectionPanel.cs
View file

@ -14,7 +14,6 @@ using Penumbra.Collections;
using Penumbra.Collections.Manager; using Penumbra.Collections.Manager;
using Penumbra.GameData.Actors; using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
using Penumbra.Mods;
using Penumbra.Mods.Manager; using Penumbra.Mods.Manager;
using Penumbra.Services; using Penumbra.Services;
using Penumbra.UI.Classes; using Penumbra.UI.Classes;
@ -38,6 +37,8 @@ public sealed class CollectionPanel : IDisposable
private static readonly IReadOnlyList<(CollectionType, bool, bool, string, uint)> AdvancedTree = CreateTree(); private static readonly IReadOnlyList<(CollectionType, bool, bool, string, uint)> AdvancedTree = CreateTree();
private readonly List<(CollectionType Type, ActorIdentifier Identifier)> _inUseCache = new(); private readonly List<(CollectionType Type, ActorIdentifier Identifier)> _inUseCache = new();
private int _draggedIndividualAssignment = -1;
public CollectionPanel(DalamudPluginInterface pi, CommunicatorService communicator, CollectionManager manager, public CollectionPanel(DalamudPluginInterface pi, CommunicatorService communicator, CollectionManager manager,
CollectionSelector selector, ActorService actors, TargetManager targets, ModStorage mods) CollectionSelector selector, ActorService actors, TargetManager targets, ModStorage mods)
{ {
@ -264,6 +265,8 @@ public sealed class CollectionPanel : IDisposable
using var disabled = ImRaii.Disabled(invalid); using var disabled = ImRaii.Disabled(invalid);
var button = ImGui.Button(text, width) || ImGui.IsItemClicked(ImGuiMouseButton.Right); var button = ImGui.Button(text, width) || ImGui.IsItemClicked(ImGuiMouseButton.Right);
var hovered = redundancy.Length > 0 && ImGui.IsItemHovered(); var hovered = redundancy.Length > 0 && ImGui.IsItemHovered();
DrawIndividualDragSource(text, id);
DrawIndividualDragTarget(text, id);
if (!invalid) if (!invalid)
{ {
_selector.DragTargetAssignment(type, id); _selector.DragTargetAssignment(type, id);
@ -280,6 +283,35 @@ public sealed class CollectionPanel : IDisposable
return button; return button;
} }
private void DrawIndividualDragSource(string text, ActorIdentifier id)
{
if (!id.IsValid)
return;
using var source = ImRaii.DragDropSource();
if (!source)
return;
ImGui.SetDragDropPayload("DragIndividual", nint.Zero, 0);
ImGui.TextUnformatted($"Re-ordering {text}...");
_draggedIndividualAssignment = _active.Individuals.Index(id);
}
private void DrawIndividualDragTarget(string text, ActorIdentifier id)
{
if (!id.IsValid)
return;
using var target = ImRaii.DragDropTarget();
if (!target || !ImGuiUtil.IsDropping("DragIndividual"))
return;
var currentIdx = _active.Individuals.Index(id);
if (_draggedIndividualAssignment != -1 && currentIdx != -1)
_active.MoveIndividualCollection(_draggedIndividualAssignment, currentIdx);
_draggedIndividualAssignment = -1;
}
private void DrawSimpleCollectionButton(CollectionType type, Vector2 width) private void DrawSimpleCollectionButton(CollectionType type, Vector2 width)
{ {
DrawButton(type.ToName(), type, width, 0, ActorIdentifier.Invalid, 's'); DrawButton(type.ToName(), type, width, 0, ActorIdentifier.Invalid, 's');