CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-03 00:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:libretro/RetroArch

Browse Source
This commit is contained in:
radius 2015-07-04 18:13:18 -05:00
commit ef3d6ffaae
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/phoenix/AndroidManifest.xml
View File

@ -4,9 +4,11 @@
android:versionName="1.2" android:installLocation="preferExternal">
<uses-feature android:glEsVersion="0x00020000" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-feature android:name="android.software.leanback" android:required="false" />
<uses-feature android:name="android.hardware.gamepad" android:required="false"/>
<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="19" />
android:targetSdkVersion="22" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CAMERA"/>
@ -18,7 +20,8 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:hasCode="true">
android:hasCode="true"
android:banner="@drawable/banner">
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<activity android:name="com.retroarch.browser.DisplayRefreshRateTest"/>
<activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">

BIN
android/phoenix/res/drawable-xhdpi/banner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

14
menu/menu_input.c
View File

@ -970,6 +970,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
unsigned ret = 0;
static bool initial_held = true;
static bool first_held = false;
static int cooldown = 0;
static const retro_input_t input_repeat =
(1UL << RETRO_DEVICE_ID_JOYPAD_UP)
| (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN)
@ -1041,10 +1042,16 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
ret = MENU_ACTION_SCROLL_UP;
else if (trigger_input & (1ULL << settings->menu_scroll_down_btn))
ret = MENU_ACTION_SCROLL_DOWN;
else if (trigger_input & (1ULL << settings->menu_cancel_btn))
else if (trigger_input & (1ULL << settings->menu_cancel_btn) && !cooldown)
{
ret = MENU_ACTION_CANCEL;
else if (trigger_input & (1ULL << settings->menu_ok_btn))
cooldown = 20;
}
else if (trigger_input & (1ULL << settings->menu_ok_btn) && !cooldown)
{
ret = MENU_ACTION_OK;
cooldown = 20;
}
else if (trigger_input & (1ULL << settings->menu_search_btn))
ret = MENU_ACTION_SEARCH;
else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y))
@ -1064,6 +1071,9 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
if (settings->menu.pointer.enable)
menu_input_pointer(&ret);
if (cooldown > 0)
cooldown--;
if (trigger_input &&
menu_ctx_driver_get_ptr()->perform_action &&
menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret))