ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 13:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: rename ImGuiHelpers.ForceMainWindow() => ForceMainViewport()

Browse source
This commit is contained in:
goat 2021-04-05 23:35:33 +02:00
parent 5f03654eee
commit 7d5680badd
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Interface/ImGuiHelpers.cs
View file

@ -22,7 +22,7 @@ namespace Dalamud.Interface
/// <summary> /// <summary>
/// Force this ImGui window to stay inside the main game window. /// Force this ImGui window to stay inside the main game window.
/// </summary> /// </summary>
public static void ForceMainWindow() => ImGui.SetNextWindowViewport(MainViewport.ID); public static void ForceMainViewport() => ImGui.SetNextWindowViewport(MainViewport.ID);
/// <summary> /// <summary>
/// Create a dummy scaled by the global Dalamud scale. /// Create a dummy scaled by the global Dalamud scale.

4
Dalamud/Interface/Windowing/Window.cs
View file

@ -141,7 +141,7 @@ namespace Dalamud.Interface.Windowing
this.ApplyConditionals(); this.ApplyConditionals();
if (this.ForceMainWindow) if (this.ForceMainWindow)
ImGuiHelpers.ForceMainWindow(); ImGuiHelpers.ForceMainViewport();
if (ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags)) if (ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags))
{ {
@ -179,7 +179,7 @@ namespace Dalamud.Interface.Windowing
var pos = this.Position.Value; var pos = this.Position.Value;
if (this.ForceMainWindow) if (this.ForceMainWindow)
pos += ImGuiHelpers.MainWindowPos; pos += ImGuiHelpers.MainViewport.Pos;
ImGui.SetNextWindowPos(pos, this.PositionCondition); ImGui.SetNextWindowPos(pos, this.PositionCondition);
} }