len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

puzzles: remember the previous preset when selecting

Browse source 
Change-Id: I22c84257a3aa9b19bf5e94f9de51204bbade08c5
This commit is contained in:
Franklin Wei 2017-05-04 20:37:04 -04:00
parent f15c117a8f
commit 271c30f206
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
apps/plugins/puzzles/rockbox.c
View file

@ -964,7 +964,8 @@ const char *preset_formatter(int sel, void *data, char *buf, size_t len)
} }
/* main worker function */ /* main worker function */
static bool do_preset_menu(struct preset_menu *menu, char *title) /* returns the index of the selected item on success, -1 on failure */
static int do_preset_menu(struct preset_menu *menu, char *title, int selected)
{ {
if(!menu->n_entries) if(!menu->n_entries)
return false; return false;
@ -977,9 +978,9 @@ static bool do_preset_menu(struct preset_menu *menu, char *title)
rb->gui_synclist_set_nb_items(&list, menu->n_entries); rb->gui_synclist_set_nb_items(&list, menu->n_entries);
rb->gui_synclist_limit_scroll(&list, false); rb->gui_synclist_limit_scroll(&list, false);
rb->gui_synclist_select_item(&list, 0); /* we don't start with the current one selected */ rb->gui_synclist_select_item(&list, selected);
char def[] = "Game Type"; static char def[] = "Game Type";
rb->gui_synclist_set_title(&list, title ? title : def, NOICON); rb->gui_synclist_set_title(&list, title ? title : def, NOICON);
while(1) while(1)
{ {
@ -996,19 +997,19 @@ static bool do_preset_menu(struct preset_menu *menu, char *title)
if(entry->params) if(entry->params)
{ {
midend_set_params(me, entry->params); midend_set_params(me, entry->params);
return true; return sel;
} }
else else
{ {
/* recurse */ /* recurse */
if(do_preset_menu(entry->submenu, entry->title)) if(do_preset_menu(entry->submenu, entry->title, 0)) /* select first one */
return true; return sel;
} }
break; break;
} }
case ACTION_STD_PREV: case ACTION_STD_PREV:
case ACTION_STD_CANCEL: case ACTION_STD_CANCEL:
return false; return -1;
default: default:
break; break;
} }
@ -1017,7 +1018,20 @@ static bool do_preset_menu(struct preset_menu *menu, char *title)
static bool presets_menu(void) static bool presets_menu(void)
{ {
return do_preset_menu(midend_get_presets(me, NULL), NULL); /* figure out the index of the current preset
* if it's in a submenu, give up and default to the first item */
struct preset_menu *top = midend_get_presets(me, NULL);
int sel = 0;
for(int i = 0; i < top->n_entries; ++i)
{
if(top->entries[i].id == midend_which_preset(me))
{
sel = i;
break;
}
}
return do_preset_menu(midend_get_presets(me, NULL), NULL, sel) >= 0;
} }
static const struct { static const struct {