From f7ba6799f64544ef653ad42b7d3706ca30492602 Mon Sep 17 00:00:00 2001 From: liam Date: Sat, 9 Jul 2022 21:43:41 -0400 Subject: [PATCH 1/6] Update ImGuiScene. --- lib/ImGuiScene | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index d6b66ce78..e05c98387 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit d6b66ce78a3d9fe2e39f9023489c836ed2146401 +Subproject commit e05c983875d10bf2586b3572c0dae59256c1500c From 3b3afa04ed4170878a0412f6d89bf3828f373faf Mon Sep 17 00:00:00 2001 From: liam Date: Sun, 10 Jul 2022 14:16:45 -0400 Subject: [PATCH 2/6] Update ImGuiScene. --- lib/ImGuiScene | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index e05c98387..620097210 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit e05c983875d10bf2586b3572c0dae59256c1500c +Subproject commit 62009721050c2c381ddc8ff7a26c363abaf73df4 From 90e7abb400a06d1d544bab599e1ef26814d90345 Mon Sep 17 00:00:00 2001 From: liam Date: Sun, 10 Jul 2022 14:24:22 -0400 Subject: [PATCH 3/6] Update ImGuiScene. --- lib/ImGuiScene | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index 620097210..f6bd3e18c 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit 62009721050c2c381ddc8ff7a26c363abaf73df4 +Subproject commit f6bd3e18c67a751df0e08ba9733f434852ecc815 From 935df775e75456738aebf1596d22171313679019 Mon Sep 17 00:00:00 2001 From: liam Date: Sun, 10 Jul 2022 20:45:17 -0400 Subject: [PATCH 4/6] Update ImGuiScene. --- lib/ImGuiScene | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index f6bd3e18c..db6a0097f 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit f6bd3e18c67a751df0e08ba9733f434852ecc815 +Subproject commit db6a0097fb2d6b8cb5b03d32b1a5014a01aa3896 From 1fdb77fd9ef4bbee6148041e3913748791f4fedb Mon Sep 17 00:00:00 2001 From: liam Date: Sun, 10 Jul 2022 21:50:55 -0400 Subject: [PATCH 5/6] 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 db6a0097f..acc1f9928 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit db6a0097fb2d6b8cb5b03d32b1a5014a01aa3896 +Subproject commit acc1f99285de7db31055211e4dfcfae648d6c219 From b9bedf36ec73bc396d78acc20bf67a982c59471c Mon Sep 17 00:00:00 2001 From: liam Date: Tue, 12 Jul 2022 12:51:03 -0400 Subject: [PATCH 6/6] Update ImGuiScene. --- lib/ImGuiScene | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index acc1f9928..1e4c06b36 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit acc1f99285de7db31055211e4dfcfae648d6c219 +Subproject commit 1e4c06b36013efb367c8c57c7f724a30f67a3973