From ac4fd47e49bb71885aa0e1e5997567ba0b6c5a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <53346444+ArchiDog1998@users.noreply.github.com> Date: Sat, 13 Jul 2024 22:29:24 +0800 Subject: [PATCH] fix: add remove one rotation feature! omg. --- ActionTimelineEx/Localization/Localization.json | 2 +- ActionTimelineEx/Windows/RotationHelperItem.cs | 7 +++++++ ActionTimelineEx/Windows/TimelineItem.cs | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json index 8037ae5..29fad44 100644 --- a/ActionTimelineEx/Localization/Localization.json +++ b/ActionTimelineEx/Localization/Localization.json @@ -27,7 +27,7 @@ "XIVConfigUI.LocalString.Remove": "Remove", "XIVConfigUI.LocalString.MoveUp": "Move Up", "XIVConfigUI.LocalString.MoveDown": "Move Down", - "ActionTimelineEx.Configurations.ActionSettingDescription": "Fell Cleave (GCD)", + "ActionTimelineEx.Configurations.ActionSettingDescription": "Infuriate (Ability)", "ActionTimelineEx.Configurations.ActionSettingName.Id": "Id", "ActionTimelineEx.Configurations.ActionSettingName.Type": "Type", "ActionTimelineEx.Configurations.ActionSettingType.Action": "Action", diff --git a/ActionTimelineEx/Windows/RotationHelperItem.cs b/ActionTimelineEx/Windows/RotationHelperItem.cs index 78444bf..43a81f4 100644 --- a/ActionTimelineEx/Windows/RotationHelperItem.cs +++ b/ActionTimelineEx/Windows/RotationHelperItem.cs @@ -47,6 +47,13 @@ public override void Draw(ConfigWindow window) ImGui.SameLine(); + if (TimelineItem.RemoveValue(setting.RotationSetting.Name)) + { + setting.RotationSettings.Remove(setting.RotationSetting); + } + + ImGui.SameLine(); + window.Collection.DrawItems(3); _group ??= new CollapsingHeaderGroup(new() diff --git a/ActionTimelineEx/Windows/TimelineItem.cs b/ActionTimelineEx/Windows/TimelineItem.cs index decd3fa..4dedbb5 100644 --- a/ActionTimelineEx/Windows/TimelineItem.cs +++ b/ActionTimelineEx/Windows/TimelineItem.cs @@ -38,9 +38,9 @@ public override void Draw(ConfigWindow window) _extraHeader?.Draw(); } - private string _undoName = string.Empty; - private DateTime _lastTime = DateTime.MinValue; - private bool RemoveValue(string name) + private static string _undoName = string.Empty; + private static DateTime _lastTime = DateTime.MinValue; + internal static bool RemoveValue(string name) { bool isLast = false, isTime = false;