Add mode to have one-line Equipment display, fix customization not changing in Designs.

Glamourer.GameData/Customization/CustomizeIndex.cs

@@ -116,7 +116,7 @@ public static class CustomizationExtensions
             CustomizeIndex.TattooColor       => "Tattoo Color",
             CustomizeIndex.Eyebrows          => "Eyebrow Style",
             CustomizeIndex.EyeColorLeft      => "Left Eye Color",
-            CustomizeIndex.EyeShape          => "Eye Shape",
+            CustomizeIndex.EyeShape          => "Small Pupils",
             CustomizeIndex.Nose              => "Nose Style",
             CustomizeIndex.Jaw               => "Jaw Style",
             CustomizeIndex.Mouth             => "Mouth Style",

Glamourer/Configuration.cs

@@ -26,6 +26,7 @@ public class Configuration : IPluginConfiguration, ISavable
     public bool               UnlockDetailMode            { get; set; } = true;
     public bool               SkipInvalidCustomizations   { get; set; } = false;
     public bool               HideApplyCheckmarks         { get; set; } = false;
+    public bool               SmallEquip                  { get; set; } = false;
     public MainWindow.TabType SelectedTab                 { get; set; } = MainWindow.TabType.Settings;
     public DoubleModifier     DeleteDesignModifier        { get; set; } = new(ModifierHotkey.Control, ModifierHotkey.Shift);
 

Glamourer/Gui/Customization/CustomizationDrawer.Simple.cs

@@ -109,23 +109,23 @@ public partial class CustomizationDrawer
         var       tmp = _currentByte != CustomizeValue.Zero;
         if (_withApply)
         {
-            switch (UiHelpers.DrawMetaToggle(_currentOption, string.Empty, tmp, _currentApply, out var newValue, out var newApply, _locked))
+            switch (UiHelpers.DrawMetaToggle(_currentIndex.ToDefaultName(), string.Empty, tmp, _currentApply, out var newValue, out var newApply, _locked))
             {
                 case DataChange.Item:
                     ChangeApply = newApply ? ChangeApply | _currentFlag : ChangeApply & ~_currentFlag;
-                    _customize.Set(idx, tmp ? CustomizeValue.Max : CustomizeValue.Zero);
+                    _customize.Set(idx, newValue ? CustomizeValue.Max : CustomizeValue.Zero);
                     Changed |= _currentFlag;
                     break;
                 case DataChange.ApplyItem:
                     ChangeApply = newApply ? ChangeApply | _currentFlag : ChangeApply & ~_currentFlag;
                     break;
                 case DataChange.Item | DataChange.ApplyItem:
-                    _customize.Set(idx, tmp ? CustomizeValue.Max : CustomizeValue.Zero);
+                    _customize.Set(idx, newValue ? CustomizeValue.Max : CustomizeValue.Zero);
                     Changed |= _currentFlag;
                     break;
             }
         }
-        else if (ImGui.Checkbox(_currentOption, ref tmp))
+        else if (ImGui.Checkbox(_currentIndex.ToDefaultName(), ref tmp))
         {
             _customize.Set(idx, tmp ? CustomizeValue.Max : CustomizeValue.Zero);
             Changed |= _currentFlag;
@@ -144,4 +144,11 @@ public partial class CustomizationDrawer
         if (UiHelpers.DrawCheckbox("##apply", $"Apply the {_currentOption} customization in this design.", _currentApply, out _, _locked))
             ToggleApply();
     }
+
+    // Update the current Apply value.
+    private void ToggleApply()
+    {
+        _currentApply = !_currentApply;
+        ChangeApply   = _currentApply ? ChangeApply | _currentFlag : ChangeApply & ~_currentFlag;
+    }
 }

Glamourer/Gui/Customization/CustomizationDrawer.cs

@@ -35,15 +35,16 @@ public partial class CustomizationDrawer : IDisposable
     public bool RequiresRedraw
         => Changed.RequiresRedraw();
 
-    private bool    _locked = false;
+    private CustomizeFlag _initialApply;
-    private Vector2 _defaultSpacing;
+    private bool          _locked = false;
-    private Vector2 _spacing;
+    private Vector2       _defaultSpacing;
-    private Vector2 _iconSize;
+    private Vector2       _spacing;
-    private Vector2 _framedIconSize;
+    private Vector2       _iconSize;
-    private float   _inputIntSize;
+    private Vector2       _framedIconSize;
-    private float   _comboSelectorSize;
+    private float         _inputIntSize;
-    private float   _raceSelectorWidth;
+    private float         _comboSelectorSize;
-    private bool    _withApply;
+    private float         _raceSelectorWidth;
+    private bool          _withApply;
 
     private readonly CustomizationService _service;
 
@@ -72,9 +73,10 @@ public partial class CustomizationDrawer : IDisposable
 
     public bool Draw(Customize current, CustomizeFlag apply, bool locked)
     {
-        CurrentFlag = CustomizeFlagExtensions.All;
+        CurrentFlag   = CustomizeFlagExtensions.All;
-        ChangeApply = apply;
+        ChangeApply   = apply;
-        _withApply  = !_config.HideApplyCheckmarks;
+        _initialApply = apply;
+        _withApply    = !_config.HideApplyCheckmarks;
         Init(current, locked);
         return DrawInternal();
     }
@@ -118,13 +120,6 @@ public partial class CustomizationDrawer : IDisposable
         Changed                   |= _currentFlag;
     }
 
-    // Update the current Apply value.
-    private void ToggleApply()
-    {
-        _currentApply = !_currentApply;
-        ChangeApply   = _currentApply ? ChangeApply | _currentFlag : ChangeApply & ~_currentFlag;
-    }
-
     public bool DrawWetnessState(bool currentValue, out bool newValue, bool locked)
         => UiHelpers.DrawCheckbox("Force Wetness", "Force the character to be wet or not.", currentValue, out newValue, locked);
 
@@ -159,7 +154,7 @@ public partial class CustomizationDrawer : IDisposable
 
             Functions.IteratePairwise(_set.Order[CharaMakeParams.MenuType.Checkmark], DrawCheckbox,
                 () => ImGui.SameLine(_comboSelectorSize - _framedIconSize.X + _spacing.X));
-            return Changed != 0;
+            return Changed != 0 || ChangeApply != _initialApply;
         }
         catch (Exception ex)
         {

Glamourer/Gui/Equipment/EquipmentDrawer.cs

@@ -83,51 +83,17 @@ public class EquipmentDrawer
         if (_config.HideApplyCheckmarks)
             cApply = null;
 
-        if (!locked && _codes.EnabledArtisan)
+        using var id      = ImRaii.PushId((int)slot);
-            return DrawEquipArtisan(slot, cArmor, out rArmor, cStain, out rStain, cApply, out rApply, out rApplyStain);
-
         var       spacing = ImGui.GetStyle().ItemInnerSpacing with { Y = ImGui.GetStyle().ItemSpacing.Y };
         using var style   = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, spacing);
 
-        var changes = DataChange.None;
+        if (_config.SmallEquip)
-        cArmor.DrawIcon(_textures, _iconSize);
+            return DrawEquipSmall(slot, cArmor, out rArmor, cStain, out rStain, cApply, out rApply, out rApplyStain, locked, gender, race);
-        ImGui.SameLine();
-        using var group = ImRaii.Group();
-        if (DrawItem(slot, cArmor, out rArmor, out var label, locked))
-            changes |= DataChange.Item;
-        if (cApply.HasValue)
-        {
-            ImGui.SameLine();
-            if (DrawApply(slot, cApply.Value, out rApply, locked))
-                changes |= DataChange.ApplyItem;
-        }
-        else
-        {
-            rApply = true;
-        }
 
-        ImGui.SameLine();
+        if (!locked && _codes.EnabledArtisan)
-        ImGui.TextUnformatted(label);
+            return DrawEquipArtisan(slot, cArmor, out rArmor, cStain, out rStain, cApply, out rApply, out rApplyStain);
-        if (DrawStain(slot, cStain, out rStain, locked))
-            changes |= DataChange.Stain;
-        if (cApply.HasValue)
-        {
-            ImGui.SameLine();
-            if (DrawApplyStain(slot, cApply.Value, out rApplyStain, locked))
-                changes |= DataChange.ApplyStain;
-        }
-        else
-        {
-            rApplyStain = true;
-        }
 
-        if (VerifyRestrictedGear(slot, rArmor, gender, race))
+        return DrawEquipNormal(slot, cArmor, out rArmor, cStain, out rStain, cApply, out rApply, out rApplyStain, locked, gender, race);
-        {
-            ImGui.SameLine();
-            ImGui.TextUnformatted("(Restricted)");
-        }
-
-        return changes;
     }
 
     public DataChange DrawWeapons(in DesignData designData, out EquipItem rMainhand, out EquipItem rOffhand, out StainId rMainhandStain,
@@ -144,97 +110,16 @@ public class EquipmentDrawer
         if (_config.HideApplyCheckmarks)
             cApply = null;
 
-        var changes = DataChange.None;
+        using var id      = ImRaii.PushId("Weapons");
+        var       spacing = ImGui.GetStyle().ItemInnerSpacing with { Y = ImGui.GetStyle().ItemSpacing.Y };
+        using var style   = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, spacing);
 
-        using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing,
+        if (_config.SmallEquip)
-            ImGui.GetStyle().ItemInnerSpacing with { Y = ImGui.GetStyle().ItemSpacing.Y });
+            return DrawWeaponsSmall(cMainhand, out rMainhand, cOffhand, out rOffhand, cMainhandStain, out rMainhandStain, cOffhandStain,
+                out rOffhandStain, cApply, out rApplyMainhand, out rApplyMainhandStain, out rApplyOffhand, out rApplyOffhandStain, locked);
 
-        cMainhand.DrawIcon(_textures, _iconSize);
+        return DrawWeaponsNormal(cMainhand, out rMainhand, cOffhand, out rOffhand, cMainhandStain, out rMainhandStain, cOffhandStain,
-        ImGui.SameLine();
+            out rOffhandStain, cApply, out rApplyMainhand, out rApplyMainhandStain, out rApplyOffhand, out rApplyOffhandStain, locked);
-        using (var group = ImRaii.Group())
-        {
-            rOffhand = cOffhand;
-            if (DrawMainhand(cMainhand, cApply.HasValue, out rMainhand, out var mainhandLabel, locked))
-            {
-                changes |= DataChange.Item;
-                if (rMainhand.Type.ValidOffhand() != cMainhand.Type.ValidOffhand())
-                {
-                    rOffhand =  _items.GetDefaultOffhand(rMainhand);
-                    changes  |= DataChange.Item2;
-                }
-            }
-
-            if (cApply.HasValue)
-            {
-                ImGui.SameLine();
-                if (DrawApply(EquipSlot.MainHand, cApply.Value, out rApplyMainhand, locked))
-                    changes |= DataChange.ApplyItem;
-            }
-            else
-            {
-                rApplyMainhand = true;
-            }
-
-            ImGui.SameLine();
-            ImGui.TextUnformatted(mainhandLabel);
-
-            if (DrawStain(EquipSlot.MainHand, cMainhandStain, out rMainhandStain, locked))
-                changes |= DataChange.Stain;
-            if (cApply.HasValue)
-            {
-                ImGui.SameLine();
-                if (DrawApplyStain(EquipSlot.MainHand, cApply.Value, out rApplyMainhandStain, locked))
-                    changes |= DataChange.ApplyStain;
-            }
-            else
-            {
-                rApplyMainhandStain = true;
-            }
-        }
-
-        if (rOffhand.Type is FullEquipType.Unknown)
-        {
-            rOffhandStain      = cOffhandStain;
-            rApplyOffhand      = false;
-            rApplyOffhandStain = false;
-            return changes;
-        }
-
-        rOffhand.DrawIcon(_textures, _iconSize);
-        ImGui.SameLine();
-        using (var group = ImRaii.Group())
-        {
-            if (DrawOffhand(rMainhand, rOffhand, out rOffhand, out var offhandLabel, locked))
-                changes |= DataChange.Item2;
-            if (cApply.HasValue)
-            {
-                ImGui.SameLine();
-                if (DrawApply(EquipSlot.OffHand, cApply.Value, out rApplyOffhand, locked))
-                    changes |= DataChange.ApplyItem2;
-            }
-            else
-            {
-                rApplyOffhand = true;
-            }
-
-            ImGui.SameLine();
-            ImGui.TextUnformatted(offhandLabel);
-
-            if (DrawStain(EquipSlot.OffHand, cOffhandStain, out rOffhandStain, locked))
-                changes |= DataChange.Stain2;
-            if (cApply.HasValue)
-            {
-                ImGui.SameLine();
-                if (DrawApplyStain(EquipSlot.OffHand, cApply.Value, out rApplyOffhandStain, locked))
-                    changes |= DataChange.ApplyStain2;
-            }
-            else
-            {
-                rApplyOffhandStain = true;
-            }
-        }
-
-        return changes;
     }
 
     public bool DrawHatState(bool currentValue, out bool newValue, bool locked)
@@ -259,7 +144,7 @@ public class EquipmentDrawer
             "Change the visibility of the characters weapons when not drawn: Hidden, Visible or Don't Apply.", currentValue, currentApply,
             out newValue, out newApply, locked);
 
-    private bool DrawMainhand(EquipItem current, bool drawAll, out EquipItem weapon, out string label, bool locked)
+    private bool DrawMainhand(EquipItem current, bool drawAll, out EquipItem weapon, out string label, bool locked, bool small)
     {
         weapon = current;
         if (!_weaponCombo.TryGetValue(drawAll ? FullEquipType.Unknown : current.Type, out var combo))
@@ -270,14 +155,14 @@ public class EquipmentDrawer
 
         label = combo.Label;
         using var disabled = ImRaii.Disabled(locked);
-        if (!combo.Draw(weapon.Name, weapon.ItemId, _comboLength))
+        if (!combo.Draw(weapon.Name, weapon.ItemId, small ? _comboLength - ImGui.GetFrameHeight() : _comboLength))
             return false;
 
         weapon = combo.CurrentSelection;
         return true;
     }
 
-    private bool DrawOffhand(EquipItem mainhand, EquipItem current, out EquipItem weapon, out string label, bool locked)
+    private bool DrawOffhand(EquipItem mainhand, EquipItem current, out EquipItem weapon, out string label, bool locked, bool small)
     {
         weapon = current;
         if (!_weaponCombo.TryGetValue(current.Type, out var combo))
@@ -288,7 +173,7 @@ public class EquipmentDrawer
 
         label = combo.Label;
         using var disabled = ImRaii.Disabled(locked);
-        var       change   = combo.Draw(weapon.Name, weapon.ItemId, _comboLength);
+        var       change   = combo.Draw(weapon.Name, weapon.ItemId, small ? _comboLength - ImGui.GetFrameHeight() : _comboLength);
         if (change)
             weapon = combo.CurrentSelection;
 
@@ -317,14 +202,14 @@ public class EquipmentDrawer
         => UiHelpers.DrawCheckbox($"##applyStain{slot}", "Apply this dye when applying the Design.", flags.HasFlag(slot.ToStainFlag()),
             out enabled, locked);
 
-    private bool DrawItem(EquipSlot slot, EquipItem current, out EquipItem armor, out string label, bool locked)
+    private bool DrawItem(EquipSlot slot, EquipItem current, out EquipItem armor, out string label, bool locked, bool small)
     {
         Debug.Assert(slot.IsEquipment() || slot.IsAccessory(), $"Called {nameof(DrawItem)} on {slot}.");
         var combo = _itemCombo[slot.ToIndex()];
         label = combo.Label;
         armor = current;
         using var disabled = ImRaii.Disabled(locked);
-        var       change   = combo.Draw(armor.Name, armor.ItemId, _comboLength);
+        var       change   = combo.Draw(armor.Name, armor.ItemId, small ? _comboLength - ImGui.GetFrameHeight() : _comboLength);
         if (change)
             armor = combo.CurrentSelection;
 
@@ -341,11 +226,13 @@ public class EquipmentDrawer
         return change;
     }
 
-    private bool DrawStain(EquipSlot slot, StainId current, out StainId ret, bool locked)
+    private bool DrawStain(EquipSlot slot, StainId current, out StainId ret, bool locked, bool small)
     {
         var       found    = _stainData.TryGetValue(current, out var stain);
         using var disabled = ImRaii.Disabled(locked);
-        var       change   = _stainCombo.Draw($"##stain{slot}", stain.RgbaColor, stain.Name, found, stain.Gloss, _comboLength);
+        var change = small
+            ? _stainCombo.Draw($"##stain{slot}", stain.RgbaColor, stain.Name, found, stain.Gloss)
+            : _stainCombo.Draw($"##stain{slot}", stain.RgbaColor, stain.Name, found, stain.Gloss, _comboLength);
         ret = current;
         if (change && _stainData.TryGetValue(_stainCombo.CurrentSelection.Key, out stain))
             ret = stain.RowIndex;
@@ -441,4 +328,250 @@ public class EquipmentDrawer
 
         return changes;
     }
+
+    private DataChange DrawEquipSmall(EquipSlot slot, EquipItem cArmor, out EquipItem rArmor, StainId cStain, out StainId rStain,
+        EquipFlag? cApply, out bool rApply, out bool rApplyStain, bool locked, Gender gender, Race race)
+    {
+        var changes = DataChange.None;
+        if (DrawStain(slot, cStain, out rStain, locked, true))
+            changes |= DataChange.Stain;
+        ImGui.SameLine();
+        if (DrawItem(slot, cArmor, out rArmor, out var label, locked, true))
+            changes |= DataChange.Item;
+        if (cApply.HasValue)
+        {
+            ImGui.SameLine();
+            if (DrawApply(slot, cApply.Value, out rApply, false))
+                changes |= DataChange.ApplyItem;
+            ImGui.SameLine();
+            if (DrawApplyStain(slot, cApply.Value, out rApplyStain, false))
+                changes |= DataChange.ApplyStain;
+        }
+        else
+        {
+            rApply      = false;
+            rApplyStain = false;
+        }
+
+        if (VerifyRestrictedGear(slot, rArmor, gender, race))
+            label += " (Restricted)";
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(label);
+
+        return changes;
+    }
+
+    private DataChange DrawEquipNormal(EquipSlot slot, EquipItem cArmor, out EquipItem rArmor, StainId cStain, out StainId rStain,
+        EquipFlag? cApply, out bool rApply, out bool rApplyStain, bool locked, Gender gender, Race race)
+    {
+        var changes = DataChange.None;
+        cArmor.DrawIcon(_textures, _iconSize);
+        ImGui.SameLine();
+        using var group = ImRaii.Group();
+        if (DrawItem(slot, cArmor, out rArmor, out var label, locked, false))
+            changes |= DataChange.Item;
+        if (cApply.HasValue)
+        {
+            ImGui.SameLine();
+            if (DrawApply(slot, cApply.Value, out rApply, locked))
+                changes |= DataChange.ApplyItem;
+        }
+        else
+        {
+            rApply = true;
+        }
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(label);
+        if (DrawStain(slot, cStain, out rStain, locked, false))
+            changes |= DataChange.Stain;
+        if (cApply.HasValue)
+        {
+            ImGui.SameLine();
+            if (DrawApplyStain(slot, cApply.Value, out rApplyStain, locked))
+                changes |= DataChange.ApplyStain;
+        }
+        else
+        {
+            rApplyStain = true;
+        }
+
+        if (VerifyRestrictedGear(slot, rArmor, gender, race))
+        {
+            ImGui.SameLine();
+            ImGui.TextUnformatted("(Restricted)");
+        }
+
+        return changes;
+    }
+
+    private DataChange DrawWeaponsSmall(EquipItem cMainhand, out EquipItem rMainhand, EquipItem cOffhand, out EquipItem rOffhand,
+        StainId cMainhandStain, out StainId rMainhandStain, StainId cOffhandStain, out StainId rOffhandStain, EquipFlag? cApply,
+        out bool rApplyMainhand, out bool rApplyMainhandStain, out bool rApplyOffhand, out bool rApplyOffhandStain, bool locked)
+    {
+        var changes = DataChange.None;
+        if (DrawStain(EquipSlot.MainHand, cMainhandStain, out rMainhandStain, locked, true))
+            changes |= DataChange.Stain;
+        ImGui.SameLine();
+
+        rOffhand = cOffhand;
+        if (DrawMainhand(cMainhand, cApply.HasValue, out rMainhand, out var mainhandLabel, locked, true))
+        {
+            changes |= DataChange.Item;
+            if (rMainhand.Type.ValidOffhand() != cMainhand.Type.ValidOffhand())
+            {
+                rOffhand =  _items.GetDefaultOffhand(rMainhand);
+                changes  |= DataChange.Item2;
+            }
+        }
+
+        if (cApply.HasValue)
+        {
+            ImGui.SameLine();
+            if (DrawApply(EquipSlot.MainHand, cApply.Value, out rApplyMainhand, locked))
+                changes |= DataChange.ApplyItem;
+            ImGui.SameLine();
+            if (DrawApplyStain(EquipSlot.MainHand, cApply.Value, out rApplyMainhandStain, locked))
+                changes |= DataChange.ApplyStain;
+        }
+        else
+        {
+            rApplyMainhand      = true;
+            rApplyMainhandStain = true;
+        }
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(mainhandLabel);
+        if (rOffhand.Type is FullEquipType.Unknown)
+        {
+            rOffhandStain      = cOffhandStain;
+            rApplyOffhand      = false;
+            rApplyOffhandStain = false;
+            return changes;
+        }
+
+        if (DrawStain(EquipSlot.OffHand, cOffhandStain, out rOffhandStain, locked, true))
+            changes |= DataChange.Stain2;
+
+        ImGui.SameLine();
+        if (DrawOffhand(rMainhand, rOffhand, out rOffhand, out var offhandLabel, locked, true))
+            changes |= DataChange.Item2;
+        if (cApply.HasValue)
+        {
+            ImGui.SameLine();
+            if (DrawApply(EquipSlot.OffHand, cApply.Value, out rApplyOffhand, locked))
+                changes |= DataChange.ApplyItem2;
+            ImGui.SameLine();
+            if (DrawApplyStain(EquipSlot.OffHand, cApply.Value, out rApplyOffhandStain, locked))
+                changes |= DataChange.ApplyStain2;
+        }
+        else
+        {
+            rApplyOffhand      = true;
+            rApplyOffhandStain = true;
+        }
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(offhandLabel);
+
+        return changes;
+    }
+
+    private DataChange DrawWeaponsNormal(EquipItem cMainhand, out EquipItem rMainhand, EquipItem cOffhand, out EquipItem rOffhand,
+        StainId cMainhandStain, out StainId rMainhandStain, StainId cOffhandStain, out StainId rOffhandStain, EquipFlag? cApply,
+        out bool rApplyMainhand, out bool rApplyMainhandStain, out bool rApplyOffhand, out bool rApplyOffhandStain, bool locked)
+    {
+        var changes = DataChange.None;
+
+        using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing,
+            ImGui.GetStyle().ItemInnerSpacing with { Y = ImGui.GetStyle().ItemSpacing.Y });
+
+        cMainhand.DrawIcon(_textures, _iconSize);
+        ImGui.SameLine();
+        using (var group = ImRaii.Group())
+        {
+            rOffhand = cOffhand;
+            if (DrawMainhand(cMainhand, cApply.HasValue, out rMainhand, out var mainhandLabel, locked, false))
+            {
+                changes |= DataChange.Item;
+                if (rMainhand.Type.ValidOffhand() != cMainhand.Type.ValidOffhand())
+                {
+                    rOffhand =  _items.GetDefaultOffhand(rMainhand);
+                    changes  |= DataChange.Item2;
+                }
+            }
+
+            if (cApply.HasValue)
+            {
+                ImGui.SameLine();
+                if (DrawApply(EquipSlot.MainHand, cApply.Value, out rApplyMainhand, locked))
+                    changes |= DataChange.ApplyItem;
+            }
+            else
+            {
+                rApplyMainhand = true;
+            }
+
+            ImGui.SameLine();
+            ImGui.TextUnformatted(mainhandLabel);
+
+            if (DrawStain(EquipSlot.MainHand, cMainhandStain, out rMainhandStain, locked, false))
+                changes |= DataChange.Stain;
+            if (cApply.HasValue)
+            {
+                ImGui.SameLine();
+                if (DrawApplyStain(EquipSlot.MainHand, cApply.Value, out rApplyMainhandStain, locked))
+                    changes |= DataChange.ApplyStain;
+            }
+            else
+            {
+                rApplyMainhandStain = true;
+            }
+        }
+
+        if (rOffhand.Type is FullEquipType.Unknown)
+        {
+            rOffhandStain      = cOffhandStain;
+            rApplyOffhand      = false;
+            rApplyOffhandStain = false;
+            return changes;
+        }
+
+        rOffhand.DrawIcon(_textures, _iconSize);
+        ImGui.SameLine();
+        using (var group = ImRaii.Group())
+        {
+            if (DrawOffhand(rMainhand, rOffhand, out rOffhand, out var offhandLabel, locked, false))
+                changes |= DataChange.Item2;
+            if (cApply.HasValue)
+            {
+                ImGui.SameLine();
+                if (DrawApply(EquipSlot.OffHand, cApply.Value, out rApplyOffhand, locked))
+                    changes |= DataChange.ApplyItem2;
+            }
+            else
+            {
+                rApplyOffhand = true;
+            }
+
+            ImGui.SameLine();
+            ImGui.TextUnformatted(offhandLabel);
+
+            if (DrawStain(EquipSlot.OffHand, cOffhandStain, out rOffhandStain, locked, false))
+                changes |= DataChange.Stain2;
+            if (cApply.HasValue)
+            {
+                ImGui.SameLine();
+                if (DrawApplyStain(EquipSlot.OffHand, cApply.Value, out rApplyOffhandStain, locked))
+                    changes |= DataChange.ApplyStain2;
+            }
+            else
+            {
+                rApplyOffhandStain = true;
+            }
+        }
+
+        return changes;
+    }
 }

Glamourer/Gui/Tabs/DesignTab/DesignPanel.cs

@@ -166,15 +166,15 @@ public class DesignPanel
         if (!ImGui.CollapsingHeader("Customization"))
             return;
 
-        _customizationDrawer.Draw(_selector.Selected!.DesignData.Customize, _selector.Selected.ApplyCustomize,
+        if (_customizationDrawer.Draw(_selector.Selected!.DesignData.Customize, _selector.Selected.ApplyCustomize,
-            _selector.Selected!.WriteProtected());
+                _selector.Selected!.WriteProtected()))
-
-        if (_customizationDrawer.ChangeApply != _selector.Selected.ApplyCustomize)
             foreach (var idx in Enum.GetValues<CustomizeIndex>())
             {
                 var flag     = idx.ToFlag();
                 var newValue = _customizationDrawer.ChangeApply.HasFlag(flag);
                 _manager.ChangeApplyCustomize(_selector.Selected, idx, newValue);
+                if (_customizationDrawer.Changed.HasFlag(flag))
+                    _manager.ChangeCustomize(_selector.Selected, idx, _customizationDrawer.Customize[idx]);
             }
 
         var wetnessChanges = _customizationDrawer.DrawWetnessState(_selector.Selected!.DesignData.IsWet(),

Glamourer/Gui/Tabs/SettingsTab.cs

@@ -35,7 +35,6 @@ public class SettingsTab : ITab
 
     private string _currentCode = string.Empty;
 
-
     public void DrawContent()
     {
         using var child = ImRaii.Child("MainWindowChild");
@@ -55,6 +54,8 @@ public class SettingsTab : ITab
             "Automatically reload equipment pieces on your own character when changing any mod options in Penumbra in their associated collection.",
             _config.AutoRedrawEquipOnChanges, _autoRedraw.SetState);
 
+        Checkbox("Smaller Equip Display", "Use single-line display without icons and small dye buttons instead of double-line display.",
+            _config.SmallEquip,           v => _config.SmallEquip = v);
         Checkbox("Hide Application Checkboxes",
             "Hide the application checkboxes in the Customization and Equipment panels of the design tab, and only show them under Application Rules.",
             _config.HideApplyCheckmarks, v => _config.HideApplyCheckmarks = v);