From 7d5680badd80b614ff94b7e0dfde7773047d2049 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Mon, 5 Apr 2021 23:35:33 +0200 Subject: [PATCH] fix: rename ImGuiHelpers.ForceMainWindow() => ForceMainViewport() --- Dalamud/Interface/ImGuiHelpers.cs | 2 +- Dalamud/Interface/Windowing/Window.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud/Interface/ImGuiHelpers.cs b/Dalamud/Interface/ImGuiHelpers.cs index 5adcaa24b..ff96cdeac 100644 --- a/Dalamud/Interface/ImGuiHelpers.cs +++ b/Dalamud/Interface/ImGuiHelpers.cs @@ -22,7 +22,7 @@ namespace Dalamud.Interface /// /// Force this ImGui window to stay inside the main game window. /// - public static void ForceMainWindow() => ImGui.SetNextWindowViewport(MainViewport.ID); + public static void ForceMainViewport() => ImGui.SetNextWindowViewport(MainViewport.ID); /// /// Create a dummy scaled by the global Dalamud scale. diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs index a827be07b..1c1c80d6d 100644 --- a/Dalamud/Interface/Windowing/Window.cs +++ b/Dalamud/Interface/Windowing/Window.cs @@ -141,7 +141,7 @@ namespace Dalamud.Interface.Windowing this.ApplyConditionals(); if (this.ForceMainWindow) - ImGuiHelpers.ForceMainWindow(); + ImGuiHelpers.ForceMainViewport(); if (ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags)) { @@ -179,7 +179,7 @@ namespace Dalamud.Interface.Windowing var pos = this.Position.Value; if (this.ForceMainWindow) - pos += ImGuiHelpers.MainWindowPos; + pos += ImGuiHelpers.MainViewport.Pos; ImGui.SetNextWindowPos(pos, this.PositionCondition); }