Merge branch 'dev/pie-lover'

AetherBags/Nodes/Color/ColorInputRow.cs

@@ -35,6 +35,11 @@ public class ColorInputRow : HorizontalListNode
                     _initialColor = color;
                     OnColorConfirmed?.Invoke(color);
                 };
+                _colorPickerAddon?.OnColorPreviewed = color =>
+                {
+                    _colorPreview?.Color = color;
+                    OnColorChange?.Invoke(color);
+                };
                 _colorPickerAddon?.OnColorCancelled = () => OnColorCanceled?.Invoke(_initialColor);
             }
         };

AetherBags/Nodes/Configuration/Currency/CurrencyConfigurationNode.cs

@@ -1,12 +1,8 @@
-using System.Drawing;
 using System.Numerics;
 using AetherBags.Configuration;
 using AetherBags.Nodes.Color;
-using Dalamud.Interface;
 using KamiToolKit.Classes;
 using KamiToolKit.Nodes;
-using KamiToolKit.Premade.Addons;
-using KamiToolKit.Premade.Nodes;
 
 namespace AetherBags.Nodes.Configuration.Currency;
 
@@ -49,11 +45,9 @@ public sealed class CurrencyConfigurationNode : TabbedVerticalListNode
             Size = new Vector2(300, 24),
             CurrentColor = config.DefaultColor,
             DefaultColor = new CurrencySettings().DefaultColor,
-            OnColorConfirmed = color =>
-            {
-                config.DefaultColor = color;
-                RefreshCurrency();
-            },
+            OnColorConfirmed = ApplyColorChange,
+            OnColorChange = ApplyColorChange,
+            OnColorCanceled = ApplyColorChange,
         };
         AddNode(defaultCurrencyColorNode);
 
@@ -120,6 +114,14 @@ public sealed class CurrencyConfigurationNode : TabbedVerticalListNode
             },
         };
         AddNode(limitCurrencyColorNode);
+
+        return;
+
+        void ApplyColorChange(Vector4 color)
+        {
+            config.DefaultColor = color;
+            RefreshCurrency();
+        }
     }
 
     private void RefreshCurrency() => System.AddonInventoryWindow.ManualCurrencyRefresh();

AetherBags/Nodes/Configuration/Layout/CompactLookaheadNode.cs

@@ -1,6 +1,4 @@
 using AetherBags.Configuration;
-using FFXIVClientStructs.FFXIV.Component.GUI;
-using KamiToolKit.Classes;
 using KamiToolKit.Classes.Timelines;
 using KamiToolKit.Nodes;
 using System.Numerics;
@@ -12,7 +10,7 @@ internal sealed class CompactLookaheadNode : SimpleComponentNode
     public readonly LabelTextNode TitleNode;
     public readonly NumericInputNode CompactLookahead = null!;
 
-    public unsafe CompactLookaheadNode()
+    public CompactLookaheadNode()
     {
         GeneralSettings config = System.Config.General;
 
@@ -28,6 +26,7 @@ internal sealed class CompactLookaheadNode : SimpleComponentNode
             Position = Position with { X = 240 },
             Size = Size with { X = 88 },
             IsVisible = true,
+            IsEnabled = config.CompactPackingEnabled,
             Value = config.CompactLookahead,
             OnValueUpdate = value =>
             {
@@ -35,7 +34,6 @@ internal sealed class CompactLookaheadNode : SimpleComponentNode
                 System.AddonInventoryWindow.ManualInventoryRefresh();
             }
         };
-        CompactLookahead.ComponentBase->SetEnabledState(config.CompactPackingEnabled);
         CompactLookahead.AttachNode(this);
 
         TitleNode.AddTimeline(new TimelineBuilder()

AetherBags/Nodes/Configuration/Layout/LayoutConfigurationNode.cs

@@ -11,7 +11,7 @@ internal class LayoutConfigurationNode : TabbedVerticalListNode
     private readonly CheckboxNode _preferLargestFitCheckboxNode = null!;
     private readonly CheckboxNode _useStableInsertCheckboxNode = null!;
 
-    public unsafe LayoutConfigurationNode()
+    public LayoutConfigurationNode()
     {
         GeneralSettings config = System.Config.General;
 
@@ -37,7 +37,7 @@ internal class LayoutConfigurationNode : TabbedVerticalListNode
                 config.CompactPackingEnabled = isChecked;
                 _preferLargestFitCheckboxNode.IsEnabled = isChecked;
                 _useStableInsertCheckboxNode.IsEnabled = isChecked;
-                _compactLookaheadNode.CompactLookahead.ComponentBase->SetEnabledState(isChecked);
+                _compactLookaheadNode.CompactLookahead.IsEnabled = isChecked;
                 System.AddonInventoryWindow.ManualInventoryRefresh();
             }
         };