diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2021-12-05 14:23:18 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-12-05 14:17:52 -0500 |
commit | d93a3cac50d966227e9c9d77391bf47b2a858fb1 (patch) | |
tree | 658f9393a68d24ca822975c7f1238f33a3e92d01 | |
parent | daa3967071b53bbf1b8941babbb3d8f137c93d21 (diff) | |
download | rockbox-d93a3cac50d966227e9c9d77391bf47b2a858fb1.tar.gz rockbox-d93a3cac50d966227e9c9d77391bf47b2a858fb1.zip |
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
-rw-r--r-- | apps/plugins/keybox.c | 2 | ||||
-rw-r--r-- | apps/plugins/properties.c | 2 | ||||
-rw-r--r-- | 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) | |||
567 | { | 567 | { |
568 | rb->gui_synclist_draw(&kb_list); | 568 | rb->gui_synclist_draw(&kb_list); |
569 | button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); | 569 | button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); |
570 | if (rb->gui_synclist_do_button(&kb_list, &button, LIST_WRAP_ON)) | 570 | if (rb->gui_synclist_do_button(&kb_list, &button, LIST_WRAP_UNLESS_HELD)) |
571 | continue; | 571 | continue; |
572 | 572 | ||
573 | switch (button) | 573 | 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) | |||
490 | { | 490 | { |
491 | button = rb->get_action(CONTEXT_LIST, HZ); | 491 | button = rb->get_action(CONTEXT_LIST, HZ); |
492 | /* HZ so the status bar redraws corectly */ | 492 | /* HZ so the status bar redraws corectly */ |
493 | if (rb->gui_synclist_do_button(&properties_lists,&button,LIST_WRAP_ON)) | 493 | if (rb->gui_synclist_do_button(&properties_lists,&button,LIST_WRAP_UNLESS_HELD)) |
494 | continue; | 494 | continue; |
495 | switch(button) | 495 | switch(button) |
496 | { | 496 | { |
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) | |||
2459 | { | 2459 | { |
2460 | rb->gui_synclist_draw(&list); | 2460 | rb->gui_synclist_draw(&list); |
2461 | int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); | 2461 | int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); |
2462 | if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_ON)) | 2462 | if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_UNLESS_HELD)) |
2463 | continue; | 2463 | continue; |
2464 | switch(button) | 2464 | switch(button) |
2465 | { | 2465 | { |
@@ -2674,7 +2674,7 @@ static bool config_menu(void) | |||
2674 | { | 2674 | { |
2675 | rb->gui_synclist_draw(&list); | 2675 | rb->gui_synclist_draw(&list); |
2676 | int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); | 2676 | int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); |
2677 | if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_ON)) | 2677 | if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_UNLESS_HELD)) |
2678 | continue; | 2678 | continue; |
2679 | switch(button) | 2679 | switch(button) |
2680 | { | 2680 | { |
@@ -2760,7 +2760,7 @@ static int do_preset_menu(struct preset_menu *menu, char *title, int selected) | |||
2760 | { | 2760 | { |
2761 | rb->gui_synclist_draw(&list); | 2761 | rb->gui_synclist_draw(&list); |
2762 | int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); | 2762 | int button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); |
2763 | if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_ON)) | 2763 | if(rb->gui_synclist_do_button(&list, &button, LIST_WRAP_UNLESS_HELD)) |
2764 | continue; | 2764 | continue; |
2765 | switch(button) | 2765 | switch(button) |
2766 | { | 2766 | { |