Browse Source

ImGui Switch/Wii U slider fixes (#1371)

* Switch/Wii U slider fixes

* Attempt at better spacing

* Updated after ImGui merge
pull/1471/head
aMannus 7 months ago committed by GitHub
parent
commit
e1f95a5ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      soh/soh/GameMenuBar.cpp
  2. 8
      soh/soh/UIWidgets.cpp

8
soh/soh/GameMenuBar.cpp

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

8
soh/soh/UIWidgets.cpp

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

Loading…
Cancel
Save