From a9e37cce0d2d5a6eb4a0896eabf8cc8947fcdc78 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Mon, 11 Mar 2013 22:22:07 +0100 Subject: [PATCH] Android ui tweaks --- android/jni/GamepadEmu.cpp | 2 +- android/jni/MenuScreens.cpp | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/android/jni/GamepadEmu.cpp b/android/jni/GamepadEmu.cpp index 826c1900b1..6db54fcad4 100644 --- a/android/jni/GamepadEmu.cpp +++ b/android/jni/GamepadEmu.cpp @@ -40,7 +40,7 @@ TouchStick leftStick(&ui_atlas, I_STICKBG, I_STICK, 0); void LayoutGamepad(int w, int h) { - float controlScale = g_Config.bLargeControls ? 1.7 : 1.0; + float controlScale = g_Config.bLargeControls ? 1.6 : 1.15; const int button_spacing = 50 * controlScale; const int arrow_spacing = 40 * controlScale; diff --git a/android/jni/MenuScreens.cpp b/android/jni/MenuScreens.cpp index fa99c76d9c..fbe6e612c8 100644 --- a/android/jni/MenuScreens.cpp +++ b/android/jni/MenuScreens.cpp @@ -249,16 +249,21 @@ void InGameMenuScreen::render() { int x = 30; int y = 50; - UICheckBox(GEN_ID, x, y += 50, "Show Debug Statistics", ALIGN_TOPLEFT, &g_Config.bShowDebugStats); - UICheckBox(GEN_ID, x, y += 50, "Show FPS", ALIGN_TOPLEFT, &g_Config.bShowFPSCounter); + int stride = 40; + int columnw = 420; + UICheckBox(GEN_ID, x, y += stride, "Show Debug Statistics", ALIGN_TOPLEFT, &g_Config.bShowDebugStats); + UICheckBox(GEN_ID, x + columnw, y, "Show FPS", ALIGN_TOPLEFT, &g_Config.bShowFPSCounter); // TODO: Maybe shouldn't show this if the screen ratios are very close... - UICheckBox(GEN_ID, x, y += 50, "Stretch to display", ALIGN_TOPLEFT, &g_Config.bStretchToDisplay); + UICheckBox(GEN_ID, x, y += stride, "Stretch to display", ALIGN_TOPLEFT, &g_Config.bStretchToDisplay); - UICheckBox(GEN_ID, x, y += 50, "Hardware Transform", ALIGN_TOPLEFT, &g_Config.bHardwareTransform); - UICheckBox(GEN_ID, x, y += 50, "Buffered Rendering", ALIGN_TOPLEFT, &g_Config.bBufferedRendering); + UICheckBox(GEN_ID, x, y += stride, "Hardware Transform", ALIGN_TOPLEFT, &g_Config.bHardwareTransform); + if (UICheckBox(GEN_ID, x, y += stride, "Buffered Rendering", ALIGN_TOPLEFT, &g_Config.bBufferedRendering)) { + if (gpu) + gpu->Resized(); + } bool fs = g_Config.iFrameSkip == 1; - UICheckBox(GEN_ID, x, y += 50, "Frameskip", ALIGN_TOPLEFT, &fs); + UICheckBox(GEN_ID, x, y += stride, "Frameskip (beta)", ALIGN_TOPLEFT, &fs); g_Config.iFrameSkip = fs ? 1 : 0; // TODO: Add UI for more than one slot.