Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-30 08:50:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1244 from raven02/patch-6

Browse Source 
Experimental add turbo key for Android
This commit is contained in:
Henrik Rydgård 2013-04-10 07:35:34 -07:00
commit 6772efbb1a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/GamepadEmu.cpp
View File

@ -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, 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);
@ -66,8 +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);
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);
@ -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);

6
UI/MenuScreens.cpp
View File

@ -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();
}