ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unify input bind hold behavior across platforms

This commit is contained in:
markwkidd 2019-01-02 18:47:40 -05:00 committed by GitHub
parent 9c5c0aea58
commit 96ea874850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/widgets/menu_input_bind_dialog.c
View File

@ -585,8 +585,6 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind)
input_driver_keyboard_mapping_set_block( true ); input_driver_keyboard_mapping_set_block( true );
menu_input_key_bind_poll_bind_state( &binds, menu_bind_port, timed_out ); menu_input_key_bind_poll_bind_state( &binds, menu_bind_port, timed_out );
#ifdef ANDROID
/*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/ /*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/
binds.buffer = *( binds.output ); binds.buffer = *( binds.output );
@ -615,16 +613,6 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind)
rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold ); rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold );
} }
#else
if ( ( binds.skip && !menu_input_binds.skip ) ||
menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) )
{
complete = true;
}
#endif
if ( complete ) if ( complete )
{ {
/*update bind*/ /*update bind*/