ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect ImGui code (#1546)

Browse source 
* Add missing ImGui.EndTabBar

* Add more ImGui fixes
This commit is contained in:
Sirius902 2023-11-26 14:04:38 -08:00 • committed by GitHub
parent 7a0de45f87
commit 473e24301d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 99 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
View file

@ -44,7 +44,8 @@ internal class PluginStatWindow : Window
{ {
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
ImGui.BeginTabBar("Stat Tabs"); if (!ImGui.BeginTabBar("Stat Tabs"))
return;
if (ImGui.BeginTabItem("Draw times")) if (ImGui.BeginTabItem("Draw times"))
{ {

2
Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
View file

@ -155,6 +155,8 @@ internal class SettingsWindow : Window
ImGui.EndTabItem(); ImGui.EndTabItem();
} }
} }
ImGui.EndTabBar();
} }
ImGui.SetCursorPos(windowSize - ImGuiHelpers.ScaledVector2(70)); ImGui.SetCursorPos(windowSize - ImGuiHelpers.ScaledVector2(70));

11
Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs
View file

@ -211,8 +211,8 @@ public class StyleEditorWindow : Window
if (ImGui.BeginTabItem(Loc.Localize("StyleEditorVariables", "Variables"))) if (ImGui.BeginTabItem(Loc.Localize("StyleEditorVariables", "Variables")))
{ {
ImGui.BeginChild($"ScrollingVars", ImGuiHelpers.ScaledVector2(0, -32), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground); if (ImGui.BeginChild($"ScrollingVars", ImGuiHelpers.ScaledVector2(0, -32), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground))
{
ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5); ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5);
ImGui.SliderFloat2("WindowPadding", ref style.WindowPadding, 0.0f, 20.0f, "%.0f"); ImGui.SliderFloat2("WindowPadding", ref style.WindowPadding, 0.0f, 20.0f, "%.0f");
@ -254,17 +254,17 @@ public class StyleEditorWindow : Window
ImGui.SameLine(); ImGui.SameLine();
ImGuiComponents.HelpMarker( ImGuiComponents.HelpMarker(
"Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured)."); "Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
ImGui.EndTabItem();
ImGui.EndChild(); ImGui.EndChild();
}
ImGui.EndTabItem(); ImGui.EndTabItem();
} }
if (ImGui.BeginTabItem(Loc.Localize("StyleEditorColors", "Colors"))) if (ImGui.BeginTabItem(Loc.Localize("StyleEditorColors", "Colors")))
{ {
ImGui.BeginChild("ScrollingColors", ImGuiHelpers.ScaledVector2(0, -30), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground); if (ImGui.BeginChild("ScrollingColors", ImGuiHelpers.ScaledVector2(0, -30), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground))
{
ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5); ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5);
if (ImGui.RadioButton("Opaque", this.alphaFlags == ImGuiColorEditFlags.None)) if (ImGui.RadioButton("Opaque", this.alphaFlags == ImGuiColorEditFlags.None))
@ -325,6 +325,7 @@ public class StyleEditorWindow : Window
} }
ImGui.EndChild(); ImGui.EndChild();
}
ImGui.EndTabItem(); ImGui.EndTabItem();
} }