Merge pull request #10 from ArchiDog1998/main

RP
ArchiDog1998 · Jul 19, 2023 · d1dec64 · d1dec64
2 parents 4676c8c + b6ada1e
commit d1dec64
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ActionTimelineEx/ActionTimelineEx.csproj b/ActionTimelineEx/ActionTimelineEx.csproj
@@ -5,7 +5,7 @@
 		<Authors>ArchiTed</Authors>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
-		<Version>1.2.1</Version>
+		<Version>1.2.2</Version>
 		<Nullable>enable</Nullable>
 		<DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs
@@ -94,9 +94,12 @@ private void AddItem(TimelineItem item)
             _items.Dequeue();
         }
         _items.Enqueue(item);
-        if (item.Type != TimelineItemType.AutoAttack) _lastItem = item;
-        _lastTime = DateTime.Now;
-        UpdateEndTime(item.EndTime);
+        if (item.Type != TimelineItemType.AutoAttack)
+        {
+            _lastItem = item;
+            _lastTime = DateTime.Now;
+            UpdateEndTime(item.EndTime);
+        }
     }
 
     private void UpdateEndTime(DateTime endTime)

diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs
@@ -151,7 +151,7 @@ private void DrawGeneralSetting()
             ImGui.SameLine();
             ImGui.NewLine();
 
-            ImGui.Text("Don't show these status.");
+            ImGui.Text("Don't record these status.");
 
             if (ImGui.BeginChild("ExceptStatus", new Vector2(0f, -1f), true))
             {
@@ -306,8 +306,8 @@ private bool RemoveValue(string name)
 
         private bool DrawGeneralTab(DrawingSettings settings)
         {
-            ImGui.InputText("Name: ", ref settings.Name, 32);
-            var result = Plugin.Settings.TimelineSettings.Any() ? RemoveValue(settings.Name) : false;
+            ImGui.InputText("Name", ref settings.Name, 32);
+            var result = Plugin.Settings.TimelineSettings.Count > 1 ? RemoveValue(settings.Name) : false;
 
             ImGui.Checkbox("Enable", ref settings.Enable);
             ImGui.Checkbox("Is Rotation", ref settings.IsRotation);

diff --git a/ActionTimelineEx/Windows/TimelineWindow.cs b/ActionTimelineEx/Windows/TimelineWindow.cs
@@ -167,7 +167,6 @@ private static void DrawGrid(Vector2 pos, Vector2 size, DrawingSettings setting)
                     drawList.AddLine(new Vector2(start, pos.Y), new Vector2(start, pos.Y + height), lineColor, setting.GridLineWidth);
                 }
 
-                if (setting.IsRotation) time -= setting.TimeOffsetSetting;
                 if (setting.GridShowSecondsText)
                 {
                     drawList.AddText(new Vector2(start + 2, pos.Y), lineColor, $" {time}s");