From 35d3e81271aaa1f3b84d2ed5533617fda0a11ea1 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, 27 Jul 2024 22:54:04 +0800
Subject: [PATCH] fix: window style fix.

---
 ActionTimelineEx/Plugin.cs                       | 2 ++
 ActionTimelineEx/Timeline/TimelineManager.cs     | 3 +--
 ActionTimelineEx/Windows/RotationHelperWindow.cs | 8 ++------
 ActionTimelineEx/Windows/TimelineWindow.cs       | 9 ++-------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs
index bb5b609..923a0c6 100644
--- a/ActionTimelineEx/Plugin.cs
+++ b/ActionTimelineEx/Plugin.cs
@@ -58,6 +58,8 @@ public class Plugin : IDalamudPlugin
         { 13409, 1 }, //RDM Embolden.
 
         { 12699, 1 }, //SMN 2703.
+
+        { 13808, 1 }, //PCT Starry Muse
     };
     public static Settings Settings { get; private set; } = null!;
 
diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs
index 79e5635..e697744 100644
--- a/ActionTimelineEx/Timeline/TimelineManager.cs
+++ b/ActionTimelineEx/Timeline/TimelineManager.cs
@@ -1,5 +1,4 @@
-using ActionTimelineEx;
-using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Hooking;
 using Dalamud.Utility.Signatures;
 using ECommons.DalamudServices;
diff --git a/ActionTimelineEx/Windows/RotationHelperWindow.cs b/ActionTimelineEx/Windows/RotationHelperWindow.cs
index a065ca7..5f2c5df 100644
--- a/ActionTimelineEx/Windows/RotationHelperWindow.cs
+++ b/ActionTimelineEx/Windows/RotationHelperWindow.cs
@@ -31,6 +31,8 @@ public static void Draw()
         using var bgColorPush = ImRaii.PushColor(ImGuiCol.WindowBg, bgColor);
 
         ImGui.SetNextWindowSize(new Vector2(560, 100) * ImGuiHelpers.GlobalScale, ImGuiCond.FirstUseEver);
+        using var border = ImRaii.PushStyle(ImGuiStyleVar.WindowBorderSize, 0);
+        using var padding = ImRaii.PushStyle(ImGuiStyleVar.WindowPadding, Vector2.Zero);
 
         if (ImGui.Begin("Rotation Helper Window", flag))
         {
@@ -49,10 +51,6 @@ public static void Draw()
             }
 
             var heightReduce = ImGui.GetCursorPosY();
-            var padding = ImGui.GetStyle().WindowPadding;
-            var border = ImGui.GetStyle().WindowBorderSize;
-            ImGui.GetStyle().WindowPadding = default;
-            ImGui.GetStyle().WindowBorderSize = 0;
             try
             {
                 RotationHelper.RotationSetting.Draw(heightReduce);
@@ -60,8 +58,6 @@ public static void Draw()
             finally
             {
                 ImGui.End();
-                ImGui.GetStyle().WindowPadding = padding;
-                ImGui.GetStyle().WindowBorderSize = border;
             }
         }
     }
diff --git a/ActionTimelineEx/Windows/TimelineWindow.cs b/ActionTimelineEx/Windows/TimelineWindow.cs
index accb40b..318632b 100644
--- a/ActionTimelineEx/Windows/TimelineWindow.cs
+++ b/ActionTimelineEx/Windows/TimelineWindow.cs
@@ -1,5 +1,4 @@
 using ActionTimelineEx.Configurations;
-using ActionTimelineEx.Helpers;
 using ActionTimelineEx.Timeline;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
@@ -31,13 +30,11 @@ public static void Draw(DrawingSettings setting, int index)
 
         ImGui.SetNextWindowSize(new Vector2(560, 100) * ImGuiHelpers.GlobalScale, ImGuiCond.FirstUseEver);
         ImGui.SetNextWindowPos(new Vector2(200, 200) * ImGuiHelpers.GlobalScale, ImGuiCond.FirstUseEver);
+        using var border = ImRaii.PushStyle(ImGuiStyleVar.WindowBorderSize, 0);
+        using var padding = ImRaii.PushStyle(ImGuiStyleVar.WindowPadding, Vector2.Zero);
 
         if (ImGui.Begin($"Timeline: {index}", flag))
         {
-            var padding = ImGui.GetStyle().WindowPadding;
-            var border = ImGui.GetStyle().WindowBorderSize;
-            ImGui.GetStyle().WindowPadding = default;
-            ImGui.GetStyle().WindowBorderSize = 0;
             try
             {
                 DrawContent(setting);
@@ -45,8 +42,6 @@ public static void Draw(DrawingSettings setting, int index)
             finally
             {
                 ImGui.End();
-                ImGui.GetStyle().WindowPadding = padding;
-                ImGui.GetStyle().WindowBorderSize = border;
             }
         }
     }