len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not redraw menu when exiting the menu.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27383 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-07-11 14:04:34 +00:00
parent 911ed00171
commit b1f5e5688c
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/menu.c
View file

@ -224,8 +224,6 @@ static void init_menu_lists(const struct menu_item_ex *menu,
get_menu_callback(menu,&menu_callback); get_menu_callback(menu,&menu_callback);
if (callback && menu_callback) if (callback && menu_callback)
menu_callback(ACTION_ENTER_MENUITEM,menu); menu_callback(ACTION_ENTER_MENUITEM,menu);
gui_synclist_draw(lists);
gui_synclist_speak_item(lists);
} }
static int talk_menu_item(int selected_item, void *data) static int talk_menu_item(int selected_item, void *data)
@ -365,12 +363,14 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
/* if hide_theme is true, assume parent has been fixed before passed into /* if hide_theme is true, assume parent has been fixed before passed into
* this function, e.g. with viewport_set_defaults(parent, screen) */ * this function, e.g. with viewport_set_defaults(parent, screen) */
init_menu_lists(menu, &lists, selected, true, parent); init_menu_lists(menu, &lists, selected, true, parent);
vps = *(lists.parent); vps = *(lists.parent);
in_stringlist = ((menu->flags&MENU_TYPE_MASK) == MT_RETURN_ID); in_stringlist = ((menu->flags&MENU_TYPE_MASK) == MT_RETURN_ID);
/* load the callback, and only reload it if menu changes */ /* load the callback, and only reload it if menu changes */
get_menu_callback(menu, &menu_callback); get_menu_callback(menu, &menu_callback);
gui_synclist_draw(&lists);
gui_synclist_speak_item(&lists);
#ifdef HAVE_BUTTONBAR #ifdef HAVE_BUTTONBAR
if (!hide_theme) if (!hide_theme)
{ {
@ -528,6 +528,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
else else
init_menu_lists(menu, &lists, init_menu_lists(menu, &lists,
menu_stack_selected_item[stack_top], false, vps); menu_stack_selected_item[stack_top], false, vps);
redraw_lists = true;
/* new menu, so reload the callback */ /* new menu, so reload the callback */
get_menu_callback(menu, &menu_callback); get_menu_callback(menu, &menu_callback);
} }
@ -573,9 +574,8 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
menu_stack[stack_top] = menu; menu_stack[stack_top] = menu;
menu_stack_selected_item[stack_top] = selected; menu_stack_selected_item[stack_top] = selected;
stack_top++; stack_top++;
init_menu_lists(temp, &lists, 0, true, vps);
redraw_lists = false; /* above does the redraw */
menu = temp; menu = temp;
init_menu_lists(menu, &lists, 0, true, vps);
} }
break; break;
case MT_FUNCTION_CALL: case MT_FUNCTION_CALL:
@ -586,11 +586,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
temp->function->param); temp->function->param);
else else
return_value = temp->function->function(); return_value = temp->function->function();
if (!(menu->flags&MENU_EXITAFTERTHISMENU) ||
(temp->flags&MENU_EXITAFTERTHISMENU))
{
init_menu_lists(menu, &lists, selected, true, vps);
}
if (temp->flags&MENU_FUNC_CHECK_RETVAL) if (temp->flags&MENU_FUNC_CHECK_RETVAL)
{ {
if (return_value != 0) if (return_value != 0)
@ -621,7 +616,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
stack_top++; stack_top++;
menu = temp; menu = temp;
init_menu_lists(menu,&lists,0,false, vps); init_menu_lists(menu,&lists,0,false, vps);
redraw_lists = false; /* above does the redraw */
in_stringlist = true; in_stringlist = true;
} }
break; break;