From d1e517004a950d9c54efa951e233d454af9ab0ed Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Tue, 8 Aug 2023 14:53:06 +0200 Subject: [PATCH] Add delete modifier to automated designs trash buttons. --- Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs | 11 +++++++---- Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs b/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs index bacd81d..a850f44 100644 --- a/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs +++ b/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs @@ -129,13 +129,16 @@ public class SetPanel ImGui.TableSetupColumn("Job Restrictions", ImGuiTableColumnFlags.WidthStretch); ImGui.TableSetupColumn(string.Empty, ImGuiTableColumnFlags.WidthFixed, 2 * ImGui.GetFrameHeight() + 4 * ImGuiHelpers.GlobalScale); ImGui.TableHeadersRow(); - foreach (var (design, idx) in Selection.Designs.WithIndex()) { using var id = ImRaii.PushId(idx); ImGui.TableNextColumn(); - if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Trash.ToIconString(), new Vector2(ImGui.GetFrameHeight()), - "Remove this design from the set.", false, true)) + var keyValid = _config.DeleteDesignModifier.IsActive(); + var tt = keyValid + ? "Remove this design from the set." + : $"Remove this design from the set.\nHold {_config.DeleteDesignModifier} to remove."; + + if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Trash.ToIconString(), new Vector2(ImGui.GetFrameHeight()), tt, !keyValid, true)) _endAction = () => _manager.DeleteDesign(Selection, idx); ImGui.TableNextColumn(); ImGui.Selectable($"#{idx + 1:D2}"); @@ -182,7 +185,7 @@ public class SetPanel var size = new Vector2(ImGui.GetFrameHeight()); size.X += ImGuiHelpers.GlobalScale; - var (equipFlags, customizeFlags, _, _, _, _) = design.ApplyWhat(); + var (equipFlags, customizeFlags, _, _, _, _) = design.ApplyWhat(); var sb = new StringBuilder(); foreach (var slot in EquipSlotExtensions.EqdpSlots.Append(EquipSlot.MainHand).Append(EquipSlot.OffHand)) { diff --git a/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs b/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs index ffec706..97d2b89 100644 --- a/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs +++ b/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs @@ -242,7 +242,7 @@ public class SetSelector : IDisposable var (disabled, tt) = HasSelection ? keyValid ? (false, "Delete the currently selected design set.") - : (true, $"Delete the currently selected design set.\n{_config.DeleteDesignModifier.ToString()}") + : (true, $"Delete the currently selected design set.\nHold {_config.DeleteDesignModifier} to delete.") : (true, "No Automatic Design Set selected."); if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Trash.ToIconString(), size, tt, disabled, true)) _manager.DeleteDesignSet(SelectionIndex);