mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Menu navigation hold adjustments

Browse Source
This commit is contained in:
sonninnos 2023-07-03 03:12:19 +03:00 committed by LibretroAdmin
parent 0b1c6257cf
commit b899f61c1f
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
menu/menu_driver.c
View File

@ -5065,10 +5065,11 @@ unsigned menu_event(
bool display_kb) bool display_kb)
{ {
/* Used for key repeat */ /* Used for key repeat */
static retro_time_t last_time_us = 0;
static float delay_timer = 0.0f; static float delay_timer = 0.0f;
static float delay_count = 0.0f; static float delay_count = 0.0f;
static bool initial_held = true; static bool hold_initial = true;
static bool first_held = false; static bool hold_reset = true;
static unsigned ok_old = 0; static unsigned ok_old = 0;
unsigned ret = MENU_ACTION_NOOP; unsigned ret = MENU_ACTION_NOOP;
bool set_scroll = false; bool set_scroll = false;
@ -5257,21 +5258,25 @@ unsigned menu_event(
if (navigation_current) if (navigation_current)
{ {
if (!first_held) float delta_time = (float)(menu_st->current_time_us - last_time_us) / 1000;
last_time_us = menu_st->current_time_us;
/* Store first direction in order to block "diagonals" */
if (!navigation_initial)
navigation_initial = navigation_current;
if (hold_reset)
{ {
/* Store first direction in order to block "diagonals" */ /* Don't run anything first frame */
if (!navigation_initial) hold_reset = false;
navigation_initial = navigation_current; delay_timer = (hold_initial) ? menu_scroll_delay : 33.33f;
/* don't run anything first frame, only capture held inputs
* for old_input_state. */
first_held = true;
delay_count = 0; delay_count = 0;
if (initial_held) }
delay_timer = menu_scroll_delay; else
else {
delay_timer = menu_scroll_delay / 8; hold_initial = false;
delay_count += delta_time;
} }
if (delay_count >= delay_timer) if (delay_count >= delay_timer)
@ -5280,25 +5285,17 @@ unsigned menu_event(
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
BIT32_SET(input_repeat, navigation_buttons[i]); BIT32_SET(input_repeat, navigation_buttons[i]);
set_scroll = true;
first_held = false;
p_trigger_input->data[0] |= p_input->data[0] & input_repeat; p_trigger_input->data[0] |= p_input->data[0] & input_repeat;
new_scroll_accel = menu_st->scroll.acceleration; set_scroll = true;
hold_reset = true;
if (menu_scroll_fast) new_scroll_accel = MIN(menu_st->scroll.acceleration + 1, (menu_scroll_fast) ? 25 : 5);
new_scroll_accel = MIN(new_scroll_accel + 1, 25);
else
new_scroll_accel = MIN(new_scroll_accel + 1, 5);
} }
initial_held = false;
delay_count += anim_get_ptr()->delta_time;
} }
else else
{ {
set_scroll = true; set_scroll = true;
first_held = false; hold_reset = true;
initial_held = true; hold_initial = true;
navigation_initial = 0; navigation_initial = 0;
} }