From 414812b52d8025a0e411a0fc5d2a3fa80982a85c Mon Sep 17 00:00:00 2001
From: liam <6005409+lmcintyre@users.noreply.github.com>
Date: Mon, 11 Jul 2022 01:47:52 -0400
Subject: [PATCH] Merge 1.88 fork into net5 (#911)

* Update ImGuiScene.

* Update ImGuiScene.

* Update ImGuiScene.

* Update ImGuiScene.

* Fix obsolete errors in Dalamud.
---
 Dalamud/Interface/Internal/UiDebug.cs                  | 2 +-
 Dalamud/Interface/Internal/Windows/PluginStatWindow.cs | 4 ++--
 Dalamud/Interface/Internal/Windows/SettingsWindow.cs   | 4 ++--
 lib/ImGuiScene                                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs
index 51e2b6b42..af06da796 100644
--- a/Dalamud/Interface/Internal/UiDebug.cs
+++ b/Dalamud/Interface/Internal/UiDebug.cs
@@ -95,7 +95,7 @@ namespace Dalamud.Interface.Internal
             ImGui.Text(isVisible ? "Visible" : "Not Visible");
             ImGui.PopStyleColor();
 
-            ImGui.SameLine(ImGui.GetWindowContentRegionWidth() - 25);
+            ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25);
             if (ImGui.SmallButton("V"))
             {
                 atkUnitBase->Flags ^= 0x20;
diff --git a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
index 0fcedc48e..68589244a 100644
--- a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
@@ -125,7 +125,7 @@ namespace Dalamud.Interface.Internal.Windows
 
                     ImGui.Columns(4);
 
-                    ImGui.SetColumnWidth(0, ImGui.GetWindowContentRegionWidth() - 300);
+                    ImGui.SetColumnWidth(0, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 300);
                     ImGui.SetColumnWidth(1, 100f);
                     ImGui.SetColumnWidth(2, 100f);
                     ImGui.SetColumnWidth(3, 100f);
@@ -179,7 +179,7 @@ namespace Dalamud.Interface.Internal.Windows
             {
                 ImGui.Columns(4);
 
-                ImGui.SetColumnWidth(0, ImGui.GetWindowContentRegionWidth() - 330);
+                ImGui.SetColumnWidth(0, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 330);
                 ImGui.SetColumnWidth(1, 180f);
                 ImGui.SetColumnWidth(2, 100f);
                 ImGui.SetColumnWidth(3, 100f);
diff --git a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
index c589a55eb..0f56a79fc 100644
--- a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
@@ -600,7 +600,7 @@ namespace Dalamud.Interface.Internal.Windows
 
             ImGui.Columns(4);
             ImGui.SetColumnWidth(0, 18 + (5 * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionWidth() - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
+            ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
             ImGui.SetColumnWidth(2, 16 + (45 * ImGuiHelpers.GlobalScale));
             ImGui.SetColumnWidth(3, 14 + (26 * ImGuiHelpers.GlobalScale));
 
@@ -739,7 +739,7 @@ namespace Dalamud.Interface.Internal.Windows
 
             ImGui.Columns(4);
             ImGui.SetColumnWidth(0, 18 + (5 * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionWidth() - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
+            ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
             ImGui.SetColumnWidth(2, 16 + (45 * ImGuiHelpers.GlobalScale));
             ImGui.SetColumnWidth(3, 14 + (26 * ImGuiHelpers.GlobalScale));
 
diff --git a/lib/ImGuiScene b/lib/ImGuiScene
index d6b66ce78..acc1f9928 160000
--- a/lib/ImGuiScene
+++ b/lib/ImGuiScene
@@ -1 +1 @@
-Subproject commit d6b66ce78a3d9fe2e39f9023489c836ed2146401
+Subproject commit acc1f99285de7db31055211e4dfcfae648d6c219