diff --git a/src/moon/imgui/imgui_impl.cpp b/src/moon/imgui/imgui_impl.cpp index 0d31d197..b162e82e 100644 --- a/src/moon/imgui/imgui_impl.cpp +++ b/src/moon/imgui/imgui_impl.cpp @@ -127,6 +127,8 @@ namespace MoonNX { } #endif +int n64Mul = 1; + namespace MoonInternal { map fontMap; @@ -266,7 +268,7 @@ namespace MoonInternal { configWindow.internal_h = configImGui.n64Mode ? SM64_HEIGHT : size.y; if(configImGui.n64Mode) { - configWindow.multiplier = 1.0f; + configWindow.multiplier = (float)n64Mul; int sw = size.y * SM64_WIDTH / SM64_HEIGHT; pos = ImVec2(size.x / 2 - sw / 2, 0); size = ImVec2(sw, size.y); @@ -284,12 +286,14 @@ namespace MoonInternal { ImGui::Text("Status: %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate); ImGui::Text("Version: " GIT_BRANCH " " GIT_HASH); ImGui::Text("Addons: %d\n", Moon::addons.size()); + ImGui::Text("Resolution: %.0fx%.0f\n", configWindow.internal_w * configWindow.multiplier, configWindow.internal_h * configWindow.multiplier); + ImGui::Text("Internal Resolution:"); - if(!configImGui.n64Mode){ - ImGui::Text("Resolution: %.0fx%.0f\n", configWindow.w * configWindow.multiplier, configWindow.h * configWindow.multiplier); - ImGui::Text("Internal Resolution:"); + if(!configImGui.n64Mode) ImGui::SliderFloat("Mul", &configWindow.multiplier, 0.0f, 4.0f); - } + else + ImGui::SliderInt("Mul", &n64Mul, 1, 8); + ImGui::End(); ImGui::PopStyleColor(); } diff --git a/src/moon/libs/imgui/imgui_draw.cpp b/src/moon/libs/imgui/imgui_draw.cpp index 61a3f3ac..fc9cd5c4 100644 --- a/src/moon/libs/imgui/imgui_draw.cpp +++ b/src/moon/libs/imgui/imgui_draw.cpp @@ -253,6 +253,10 @@ void ImGui::StyleColorsMoonDark(ImGuiStyle* dst) { ImGuiStyle* style = dst ? dst : &ImGui::GetStyle(); ImVec4* colors = ImGui::GetStyle().Colors; +#ifdef TARGET_SWITCH + style->ScaleAllSizes(3.0f); + style->TouchExtraPadding = ImVec2(5, 5); +#endif colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); colors[ImGuiCol_TextDisabled] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); colors[ImGuiCol_WindowBg] = ImVec4(0.04f, 0.04f, 0.04f, 0.94f);