fix: window style fix.

ArchiDog1998 · Jul 27, 2024 · 35d3e81 · 35d3e81
1 parent 2e91e36
commit 35d3e81
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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,19 +51,13 @@ 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);
             }
             finally
             {
                 ImGui.End();
-                ImGui.GetStyle().WindowPadding = padding;
-                ImGui.GetStyle().WindowBorderSize = border;
             }
         }
     }

diff --git 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,22 +30,18 @@ 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);
             }
             finally
             {
                 ImGui.End();
-                ImGui.GetStyle().WindowPadding = padding;
-                ImGui.GetStyle().WindowBorderSize = border;
             }
         }
     }