mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-03-03 10:11:51 -05:00
Code Issues Projects Releases Wiki Activity

ImGui Switch/Wii U slider fixes (#1371)

Browse Source 
* Switch/Wii U slider fixes

* Attempt at better spacing

* Updated after ImGui merge
This commit is contained in:
aMannus 2022-09-14 02:47:00 +02:00 committed by GitHub
parent 18a26b480e
commit e1f95a5ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/GameMenuBar.cpp
View File

@ -545,7 +545,11 @@ namespace GameMenuBar {
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f); ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
#if defined(__SWITCH__) || defined(__WIIU__)
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 110.0f);
#else
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f); ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f);
#endif
if (ImGui::SliderInt("##ExtraLatencyThreshold", &val, 0, 360, "", ImGuiSliderFlags_AlwaysClamp)) if (ImGui::SliderInt("##ExtraLatencyThreshold", &val, 0, 360, "", ImGuiSliderFlags_AlwaysClamp))
{ {
CVar_SetS32(cvar, val); CVar_SetS32(cvar, val);
@ -1069,8 +1073,8 @@ namespace GameMenuBar {
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f); ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
#ifdef __WIIU__ #if defined(__SWITCH__) || defined(__WIIU__)
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f * 2); ImGui::PushItemWidth(ImGui::GetWindowSize().x - 110.0f);
#else #else
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f); ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f);
#endif #endif

8
soh/soh/UIWidgets.cpp
View File

@ -322,11 +322,11 @@ namespace UIWidgets {
ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f); ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
} }
if (PlusMinusButton) { if (PlusMinusButton) {
#ifdef __WIIU__ #if defined(__SWITCH__) || defined(__WIIU__)
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f * 2); ImGui::PushItemWidth(ImGui::GetWindowSize().x - 110.0f);
#else #else
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f); ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f);
#endif #endif
} }
if (ImGui::SliderFloat(id, &val, min, max, format)) if (ImGui::SliderFloat(id, &val, min, max, format))
{ {