Fixed menubar items position (#763)

KiritoDv · briaguya0 · commit 3f5af8e53a46 · 2022-07-14T01:53:03.000-04:00
* Fixed menubar items position

* Reverted tooltip tab position
diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp
@@ -736,6 +736,10 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            ImGui::Separator();
+
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Audio")) {
                 EnhancementSliderFloat("Master Volume: %d %%", "##Master_Vol", "gGameMasterVolume", 0.0f, 1.0f, "", 1.0f, true);
 
@@ -747,6 +751,8 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Controller"))
             {
                 EnhancementCheckbox("Use Controller Navigation", "gControlNav");
@@ -775,6 +781,8 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Graphics"))
             {
                 EnhancementSliderFloat("Internal Resolution: %d %%", "##IMul", "gInternalResolution", 0.5f, 2.0f, "", 1.0f, true);
@@ -823,13 +831,17 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Languages")) {
                 EnhancementRadioButton("English", "gLanguages", 0);
                 EnhancementRadioButton("German", "gLanguages", 1);
                 EnhancementRadioButton("French", "gLanguages", 2);
                 ImGui::EndMenu();
             }
 
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Enhancements"))
             {
                 if (ImGui::BeginMenu("Gameplay"))
@@ -1154,6 +1166,8 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Cheats"))
             {
                 if (ImGui::BeginMenu("Infinite...")) {
@@ -1191,6 +1205,8 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            ImGui::SetCursorPosY(0.0f);
+
             if (ImGui::BeginMenu("Developer Tools"))
             {
                 EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");
@@ -1211,6 +1227,7 @@ namespace SohImGui {
             }
 
             for (const auto& category : windowCategories) {
+                ImGui::SetCursorPosY(0.0f);
                 if (ImGui::BeginMenu(category.first.c_str())) {
                     for (const std::string& name : category.second) {
                         std::string varName(name);

Original file line number	Diff line number	Diff line change
`@@ -736,6 +736,10 @@ namespace SohImGui {`
`736`	`736`	`ImGui::EndMenu();`
`737`	`737`	`}`
`738`	`738`
	`739`	`+ ImGui::Separator();`
	`740`	`+`
	`741`	`+ ImGui::SetCursorPosY(0.0f);`
	`742`	`+`
`739`	`743`	`if (ImGui::BeginMenu("Audio")) {`
`740`	`744`	`EnhancementSliderFloat("Master Volume: %d %%", "##Master_Vol", "gGameMasterVolume", 0.0f, 1.0f, "", 1.0f, true);`
`741`	`745`
`@@ -747,6 +751,8 @@ namespace SohImGui {`
`747`	`751`	`ImGui::EndMenu();`
`748`	`752`	`}`
`749`	`753`
	`754`	`+ ImGui::SetCursorPosY(0.0f);`
	`755`	`+`
`750`	`756`	`if (ImGui::BeginMenu("Controller"))`
`751`	`757`	`{`
`752`	`758`	`EnhancementCheckbox("Use Controller Navigation", "gControlNav");`
`@@ -775,6 +781,8 @@ namespace SohImGui {`
`775`	`781`	`ImGui::EndMenu();`
`776`	`782`	`}`
`777`	`783`
	`784`	`+ ImGui::SetCursorPosY(0.0f);`
	`785`	`+`
`778`	`786`	`if (ImGui::BeginMenu("Graphics"))`
`779`	`787`	`{`
`780`	`788`	`EnhancementSliderFloat("Internal Resolution: %d %%", "##IMul", "gInternalResolution", 0.5f, 2.0f, "", 1.0f, true);`
`@@ -823,13 +831,17 @@ namespace SohImGui {`
`823`	`831`	`ImGui::EndMenu();`
`824`	`832`	`}`
`825`	`833`
	`834`	`+ ImGui::SetCursorPosY(0.0f);`
	`835`	`+`
`826`	`836`	`if (ImGui::BeginMenu("Languages")) {`
`827`	`837`	`EnhancementRadioButton("English", "gLanguages", 0);`
`828`	`838`	`EnhancementRadioButton("German", "gLanguages", 1);`
`829`	`839`	`EnhancementRadioButton("French", "gLanguages", 2);`
`830`	`840`	`ImGui::EndMenu();`
`831`	`841`	`}`
`832`	`842`
	`843`	`+ ImGui::SetCursorPosY(0.0f);`
	`844`	`+`
`833`	`845`	`if (ImGui::BeginMenu("Enhancements"))`
`834`	`846`	`{`
`835`	`847`	`if (ImGui::BeginMenu("Gameplay"))`
`@@ -1154,6 +1166,8 @@ namespace SohImGui {`
`1154`	`1166`	`ImGui::EndMenu();`
`1155`	`1167`	`}`
`1156`	`1168`
	`1169`	`+ ImGui::SetCursorPosY(0.0f);`
	`1170`	`+`
`1157`	`1171`	`if (ImGui::BeginMenu("Cheats"))`
`1158`	`1172`	`{`
`1159`	`1173`	`if (ImGui::BeginMenu("Infinite...")) {`
`@@ -1191,6 +1205,8 @@ namespace SohImGui {`
`1191`	`1205`	`ImGui::EndMenu();`
`1192`	`1206`	`}`
`1193`	`1207`
	`1208`	`+ ImGui::SetCursorPosY(0.0f);`
	`1209`	`+`
`1194`	`1210`	`if (ImGui::BeginMenu("Developer Tools"))`
`1195`	`1211`	`{`
`1196`	`1212`	`EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");`
`@@ -1211,6 +1227,7 @@ namespace SohImGui {`
`1211`	`1227`	`}`
`1212`	`1228`
`1213`	`1229`	`for (const auto& category : windowCategories) {`
	`1230`	`+ ImGui::SetCursorPosY(0.0f);`
`1214`	`1231`	`if (ImGui::BeginMenu(category.first.c_str())) {`
`1215`	`1232`	`for (const std::string& name : category.second) {`
`1216`	`1233`	`std::string varName(name);`