From 36f8e70773dea4874239fbc064ae81e9680a709b Mon Sep 17 00:00:00 2001 From: raven02 Date: Wed, 10 Apr 2013 21:14:25 +0800 Subject: [PATCH 1/3] Experimental add turbo key for Android --- UI/GamepadEmu.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index 7e230f6e5e..fade5e52cf 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -28,6 +28,7 @@ TouchButton buttonSelect(&ui_atlas, I_RECT, I_SELECT, PAD_BUTTON_SELECT); TouchButton buttonStart(&ui_atlas, I_RECT, I_START, PAD_BUTTON_START); TouchButton buttonLShoulder(&ui_atlas, I_SHOULDER, I_L, PAD_BUTTON_LBUMPER); TouchButton buttonRShoulder(&ui_atlas, I_SHOULDER, I_R, PAD_BUTTON_RBUMPER, 0, true); +TouchButton buttonTurbo(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_LEFT_THUMB, 90); TouchCrossPad crossPad(&ui_atlas, I_DIR, I_ARROW); #if defined(__SYMBIAN32__) || defined(IOS) TouchButton buttonPause(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_BACK, 90); @@ -68,6 +69,7 @@ void LayoutGamepad(int w, int h) buttonStart.setPos(halfW + button_spacing, h - 20 * controlScale, controlScale); buttonLShoulder.setPos(button_spacing + 10 * controlScale, 15 * controlScale, controlScale); buttonRShoulder.setPos(w - button_spacing - 10 * controlScale, 15 * controlScale, controlScale); + buttonTurbo.setPos(halfW, 15 * controlScale, controlScale); #if defined(__SYMBIAN32__) || defined(IOS) buttonPause.setPos(halfW, 15 * controlScale, controlScale); @@ -91,6 +93,7 @@ void UpdateGamepad(InputState &input_state) buttonStart.update(input_state); buttonLShoulder.update(input_state); buttonRShoulder.update(input_state); + buttonTurbo.update(input_state); #if defined(__SYMBIAN32__) || defined(IOS) buttonPause.update(input_state); @@ -115,6 +118,7 @@ void DrawGamepad(DrawBuffer &db) buttonStart.draw(db, color, colorOverlay); buttonLShoulder.draw(db, color, colorOverlay); buttonRShoulder.draw(db, color, colorOverlay); + buttonTurbo.draw(db, color, colorOverlay); #if defined(__SYMBIAN32__) || defined(IOS) buttonPause.draw(db, color, colorOverlay); From fee492705545bf034c849f0289a0c09d18d8d845 Mon Sep 17 00:00:00 2001 From: raven02 Date: Wed, 10 Apr 2013 21:16:33 +0800 Subject: [PATCH 2/3] Cosmetic fix to menu screen --- UI/MenuScreens.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index d073f261cd..84c3d404a5 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -199,7 +199,7 @@ void MenuScreen::render() { ui_draw2d.DrawTextShadow(UBUNTU24, PPSSPP_GIT_VERSION, dp_xres + xoff, 85, 0xFFFFFFFF, ALIGN_RIGHT | ALIGN_BOTTOM); ui_draw2d.SetFontScale(1.0f, 1.0f); VLinear vlinear(dp_xres + xoff, 100, 20); - VGrid vgrid_recent(-xoff + 40, 100, 480, 40, 20); + VGrid vgrid_recent(-xoff + 20, 100, 480, 40, 20); if (UIButton(GEN_ID, vlinear, w, "Load...", ALIGN_RIGHT)) { #if defined(USING_QT_UI) @@ -458,7 +458,7 @@ void SettingsScreen::render() { if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres-10), LARGE_BUTTON_WIDTH, "Back", ALIGN_RIGHT | ALIGN_BOTTOM)) { screenManager()->finishDialog(this, DR_OK); } - if (UIButton(GEN_ID, Pos(10, dp_yres-10), LARGE_BUTTON_WIDTH, "Developer Menu", ALIGN_BOTTOMLEFT)) { + if (UIButton(GEN_ID, Pos(10, dp_yres-10), LARGE_BUTTON_WIDTH + 20, "Developer Menu", ALIGN_BOTTOMLEFT)) { screenManager()->push(new DeveloperScreen()); } @@ -490,7 +490,7 @@ void DeveloperScreen::render() { } - if (UIButton(GEN_ID, Pos(10, dp_yres-10), LARGE_BUTTON_WIDTH, "Dump frame to log", ALIGN_BOTTOMLEFT)) { + if (UIButton(GEN_ID, Pos(10, dp_yres-10), LARGE_BUTTON_WIDTH + 40, "Dump frame to log", ALIGN_BOTTOMLEFT)) { gpu->DumpNextFrame(); } From 1fa12054b8acd48f49c6a4a692e6886bebe6863f Mon Sep 17 00:00:00 2001 From: raven02 Date: Wed, 10 Apr 2013 22:24:10 +0800 Subject: [PATCH 3/3] Positional fix --- UI/GamepadEmu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index fade5e52cf..ebc96927bf 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -28,7 +28,7 @@ TouchButton buttonSelect(&ui_atlas, I_RECT, I_SELECT, PAD_BUTTON_SELECT); TouchButton buttonStart(&ui_atlas, I_RECT, I_START, PAD_BUTTON_START); TouchButton buttonLShoulder(&ui_atlas, I_SHOULDER, I_L, PAD_BUTTON_LBUMPER); TouchButton buttonRShoulder(&ui_atlas, I_SHOULDER, I_R, PAD_BUTTON_RBUMPER, 0, true); -TouchButton buttonTurbo(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_LEFT_THUMB, 90); +TouchButton buttonTurbo(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_LEFT_THUMB, 0); TouchCrossPad crossPad(&ui_atlas, I_DIR, I_ARROW); #if defined(__SYMBIAN32__) || defined(IOS) TouchButton buttonPause(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_BACK, 90); @@ -67,9 +67,9 @@ void LayoutGamepad(int w, int h) buttonSelect.setPos(halfW - button_spacing, h - 20 * controlScale, controlScale); buttonStart.setPos(halfW + button_spacing, h - 20 * controlScale, controlScale); - buttonLShoulder.setPos(button_spacing + 10 * controlScale, 15 * controlScale, controlScale); - buttonRShoulder.setPos(w - button_spacing - 10 * controlScale, 15 * controlScale, controlScale); - buttonTurbo.setPos(halfW, 15 * controlScale, controlScale); + buttonLShoulder.setPos(button_spacing + 10 * controlScale, 80 * controlScale, controlScale); + buttonRShoulder.setPos(w - button_spacing - 10 * controlScale, 80 * controlScale, controlScale); + buttonTurbo.setPos(button_spacing, 20 * controlScale, controlScale); #if defined(__SYMBIAN32__) || defined(IOS) buttonPause.setPos(halfW, 15 * controlScale, controlScale);