diff --git a/Glamourer/Gui/Equipment/GlamourerColorCombo.cs b/Glamourer/Gui/Equipment/GlamourerColorCombo.cs index 5cdb6d4..0bd55dd 100644 --- a/Glamourer/Gui/Equipment/GlamourerColorCombo.cs +++ b/Glamourer/Gui/Equipment/GlamourerColorCombo.cs @@ -13,17 +13,12 @@ using Penumbra.GameData.Structs; namespace Glamourer.Gui.Equipment; -public sealed class GlamourerColorCombo : FilterComboColors +public sealed class GlamourerColorCombo(float _comboWidth, StainData _stains, FavoriteManager _favorites) + : FilterComboColors(_comboWidth, CreateFunc(_stains, _favorites), Glamourer.Log) { - private readonly FavoriteManager _favorites; - - public GlamourerColorCombo(float comboWidth, StainData stains, FavoriteManager favorites) - : base(comboWidth, CreateFunc(stains, favorites), Glamourer.Log) - => _favorites = favorites; - protected override bool DrawSelectable(int globalIdx, bool selected) { - using (var space = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, ImGuiHelpers.ScaledVector2(4, 0))) + using (var _ = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, ImGuiHelpers.ScaledVector2(4, 0))) { if (globalIdx == 0) { @@ -32,7 +27,7 @@ public sealed class GlamourerColorCombo : FilterComboColors } else { - UiHelpers.DrawFavoriteStar(_favorites, (StainId)Items[globalIdx].Key); + UiHelpers.DrawFavoriteStar(_favorites, Items[globalIdx].Key); } ImGui.SameLine(); diff --git a/OtterGui b/OtterGui index f624aca..6a73878 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit f624aca526bd1f36364d63443ed1c6e83499b8b7 +Subproject commit 6a73878abbb477dc441ade70ad40352e2da9cc4c