really fix the yes/no screen now, also id3 viewer shows the status bar

correctly


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10630 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2006-08-17 09:28:04 +00:00
parent 5b71470185
commit 07d3db2dec
4 changed files with 5 additions and 5 deletions

View file

@ -111,8 +111,7 @@ int get_action_worker(int context, int timeout,
{ {
ignore_until_release = false; ignore_until_release = false;
} }
/*last_button = BUTTON_NONE; this is done by action_signalscreenchange() */ return ACTION_NONE; /* "safest" return value */
return ACTION_UNKNOWN; /* "safest" return value */
} }
#if (BUTTON_REMOTE != 0) #if (BUTTON_REMOTE != 0)
if (soft_unlock_action != ACTION_NONE) if (soft_unlock_action != ACTION_NONE)

View file

@ -80,7 +80,8 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
case ACTION_YESNO_ACCEPT: case ACTION_YESNO_ACCEPT:
result=YESNO_YES; result=YESNO_YES;
break; break;
case ACTION_NONE:
continue;
default: default:
if(default_event_handler(button) == SYS_USB_CONNECTED) if(default_event_handler(button) == SYS_USB_CONNECTED)
return(YESNO_USB); return(YESNO_USB);

View file

@ -84,7 +84,7 @@ const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON },
{ ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_ON }, { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE },
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_wps */ }; /* button_context_wps */

View file

@ -1118,13 +1118,13 @@ bool browse_id3(void)
gui_synclist_draw(&id3_lists); gui_synclist_draw(&id3_lists);
action_signalscreenchange(); action_signalscreenchange();
while (true) { while (true) {
gui_syncstatusbar_draw(&statusbars, false);
key = get_action(CONTEXT_LIST,HZ/2); key = get_action(CONTEXT_LIST,HZ/2);
if(key!=ACTION_NONE && key!=ACTION_UNKNOWN && !gui_synclist_do_button(&id3_lists, key)) if(key!=ACTION_NONE && key!=ACTION_UNKNOWN && !gui_synclist_do_button(&id3_lists, key))
{ {
action_signalscreenchange(); action_signalscreenchange();
return(default_event_handler(key) == SYS_USB_CONNECTED); return(default_event_handler(key) == SYS_USB_CONNECTED);
} }
gui_syncstatusbar_draw(&statusbars, false);
} }
} }