Fixed Retainer/SaddleBag drag

AetherBags/Addons/AddonCategoryConfigurationWindow.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using AetherBags.Configuration;
+using AetherBags.Inventory;
 using AetherBags.Nodes.Configuration.Category;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using KamiToolKit;
@@ -118,7 +119,7 @@ public class AddonCategoryConfigurationWindow : NativeAddon
         listNode.AddOption(newWrapper);
 
         RefreshSelectionList();
-        System.AddonInventoryWindow.ManualRefresh();
+        InventoryOrchestrator.RefreshAll(updateMaps: true);
     }
 
     private void OnRemoveCategory(CategoryWrapper categoryWrapper)
@@ -134,7 +135,7 @@ public class AddonCategoryConfigurationWindow : NativeAddon
         {
             OnOptionChanged(null);
         }
-        System.AddonInventoryWindow.ManualRefresh();
+        InventoryOrchestrator.RefreshAll(updateMaps: true);
     }
 
     private void RefreshSelectionList()

AetherBags/Addons/AddonRetainerWindow.cs

@@ -1,15 +1,16 @@
-using System. Numerics;
+using System.Numerics;
+using AetherBags.Inventory;
 using AetherBags.Inventory.State;
-using AetherBags. Nodes. Input;
-using AetherBags. Nodes. Inventory;
-using AetherBags. Nodes.Layout;
-using Dalamud.Game. Addon.Lifecycle;
-using Dalamud.Game. Addon.Lifecycle.AddonArgTypes;
+using AetherBags.Nodes.Input;
+using AetherBags.Nodes.Inventory;
+using AetherBags.Nodes.Layout;
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
-using FFXIVClientStructs. FFXIV. Component. GUI;
+using FFXIVClientStructs.FFXIV.Component.GUI;
 using KamiToolKit.Classes;
-using KamiToolKit. Nodes;
+using KamiToolKit.Nodes;
 
 namespace AetherBags.Addons;
 
@@ -25,12 +26,14 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
     protected override bool HasFooter => false;
     protected override bool HasSlotCounter => true;
 
+    private readonly Vector3 _tintColor = new(8f / 255f, -8f / 255f, -4f / 255f);
+
     protected override float MinWindowWidth => 400;
     protected override float MaxWindowWidth => 700;
 
     protected override void OnSetup(AtkUnitBase* addon)
     {
-        WindowNode?.AddColor = new Vector3(8f / 255f, -8f / 255f, -4f / 255f);
+        WindowNode?.AddColor = _tintColor;
 
         CategoriesNode = new WrappingGridNode<InventoryCategoryNode>
         {
@@ -43,7 +46,7 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
         };
         CategoriesNode.AttachNode(this);
 
-        var size = new Vector2(addon->Size. X / 2.0f, 28.0f);
+        var size = new Vector2(addon->Size.X / 2.0f, 28.0f);
 
         var header = addon->WindowHeaderCollisionNode;
 
@@ -61,7 +64,7 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
             Size = size,
             OnInputReceived = _ => RefreshCategoriesCore(autosize: false),
         };
-        SearchInputNode. AttachNode(this);
+        SearchInputNode.AttachNode(this);
 
         SettingsButtonNode = new CircleButtonNode
         {
@@ -70,9 +73,8 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
             Icon = ButtonIcon.GearCog,
             OnClick = System.AddonConfigurationWindow.Toggle
         };
-        SettingsButtonNode. AttachNode(this);
+        SettingsButtonNode.AttachNode(this);
 
-        // Retainer name display
         _retainerNameNode = new TextNode
         {
             Position = new Vector2(8f, 0),
@@ -88,6 +90,7 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
         _entrustDuplicatesButton = new TextButtonNode
         {
             Size = new Vector2(120, 28),
+            AddColor = _tintColor,
             String = "Entrust Duplicates",
             OnClick = OnEntrustDuplicates,
         };
@@ -137,7 +140,7 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
 
         float footerY = contentPos.Y + contentSize.Y - FooterHeight + 4f;
 
-        _retainerNameNode. Position = new Vector2(contentPos.X + 8f, footerY);
+        _retainerNameNode.Position = new Vector2(contentPos.X + 8f, footerY);
 
         float buttonWidth = _entrustDuplicatesButton.Width;
         float buttonX = contentPos.X + (contentSize.X - buttonWidth) / 2f;
@@ -158,7 +161,14 @@ public unsafe class AddonRetainerWindow : InventoryAddonBase
             RefreshCategoriesCore(doAutosize);
         }
 
-        base. OnUpdate(addon);
+        base.OnUpdate(addon);
+    }
+
+    protected override void OnShow(AtkUnitBase* addon)
+    {
+        base.OnShow(addon);
+
+        InventoryOrchestrator.RefreshAll(updateMaps: true);
     }
 
     private void OnEntrustDuplicates()

AetherBags/Addons/AddonSaddleBagWindow.cs

@@ -19,12 +19,14 @@ public unsafe class AddonSaddleBagWindow :  InventoryAddonBase
     protected override bool HasFooter => false;
     protected override bool HasSlotCounter => true;
 
+    private readonly Vector3 _tintColor = new (-16f / 255f, -4f / 255f, 8f / 255f);
+
     protected override float MinWindowWidth => 400;
     protected override float MaxWindowWidth => 600;
 
     protected override void OnSetup(AtkUnitBase* addon)
     {
-        WindowNode?.AddColor = new Vector3(-16f / 255f, -4f / 255f, 8f / 255f);
+        WindowNode?.AddColor = _tintColor;
 
         CategoriesNode = new WrappingGridNode<InventoryCategoryNode>
         {
@@ -61,6 +63,7 @@ public unsafe class AddonSaddleBagWindow :  InventoryAddonBase
         {
             Position = new Vector2(headerW - 48f, y),
             Size = new Vector2(28f),
+            AddColor = _tintColor,
             Icon = ButtonIcon.GearCog,
             OnClick = System.AddonConfigurationWindow.Toggle
         };

AetherBags/Addons/InventoryAddonBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using AetherBags.Inventory;
 using AetherBags.Inventory.Categories;
 using AetherBags.Inventory.State;
 using AetherBags.Nodes.Input;
@@ -65,16 +66,6 @@ public abstract unsafe class InventoryAddonBase :  NativeAddon
         }
     }
 
-    protected static void RefreshAllInventoryWindows()
-    {
-        Services.Framework.RunOnTick(() =>
-        {
-            System.AddonInventoryWindow?.ManualRefresh();
-            System.AddonSaddleBagWindow?.ManualRefresh();
-            System.AddonRetainerWindow?.ManualRefresh();
-        }, delayTicks: 2);
-    }
-
     public void RefreshFromLifecycle()
     {
         if (!_isSetupComplete) return;
@@ -144,7 +135,7 @@ public abstract unsafe class InventoryAddonBase :  NativeAddon
         {
             Size = ContentSize with { Y = 120 },
             OnRefreshRequested = ManualRefresh,
-            OnDragEnd = RefreshAllInventoryWindows,
+            OnDragEnd = () => InventoryOrchestrator.RefreshAll(updateMaps: true),
         };
     }