From d93a3cac50d966227e9c9d77391bf47b2a858fb1 Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Sun, 5 Dec 2021 14:23:18 +0100 Subject: Use LIST_WRAP_UNLESS_HELD consistently LIST_WRAP_ON seems to only be used in 3 places at this point. - Keybox Plugin - Puzzles Plugin - (File) Properties Plugin Switch them them over to LIST_WRAP_UNLESS_HELD as that is used everywhere else and is arguably preferable (the option to turn off list wrapping completely remains, of course). Change-Id: Id8017dcbb123a0568cb6db527a8966b63ba06d47 --- apps/plugins/keybox.c | 2 +- apps/plugins/properties.c | 2 +- apps/plugins/puzzles/rockbox.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index a074ffc598..f8c6800a4d 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c @@ -567,7 +567,7 @@ static int keybox(void) { rb->gui_synclist_draw(&kb_list); button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); - if (rb->gui_synclist_do_button(&kb_list, &button, LIST_WRAP_ON)) + if (rb->gui_synclist_do_button(&kb_list, &button, LIST_WRAP_UNLESS_HELD)) continue; switch (button) diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c index 839e593682..fa3517726a 100644 --- a/apps/plugins/properties.c +++ b/apps/plugins/properties.c @@ -490,7 +490,7 @@ enum plugin_status plugin_start(const void* parameter) { button = rb->get_action(CONTEXT_LIST, HZ); /* HZ so the status bar redraws corectly */ - if (rb->gui_synclist_do_button(&properties_lists,&button,LIST_WRAP_ON)) + if (rb->gui_synclist_do_button(&properties_lists,&button,LIST_WRAP_UNLESS_HELD)) continue; switch(button) { diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c index 73f9857b4a..6e34adb1db 100644 --- a/apps/plugins/puzzles/rockbox.c +++ b/apps/plugins/puzzles/rockbox.c @@ -2459,7 +2459,7 @@ static int list_choose(const char *list_str, const char *title, int sel) { rb->gui_synclist_draw(&list); int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); - if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_ON)) + if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_UNLESS_HELD)) continue; switch(button) { @@ -2674,7 +2674,7 @@ static bool config_menu(void) { rb->gui_synclist_draw(&list); int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); - if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_ON)) + if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_UNLESS_HELD)) continue; switch(button) { @@ -2760,7 +2760,7 @@ static int do_preset_menu(struct preset_menu *menu, char *title, int selected) { rb->gui_synclist_draw(&list); int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); - if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_ON)) + if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_UNLESS_HELD)) continue; switch(button) { -- cgit v1.2.3