Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "fix erroneous button read in yesno screen and missed buttons in action.c."

Browse source 
This reverts commit 15775c8bad.
This commit is contained in:
Jonathan Gordon 2012-08-14 12:12:15 +10:00
parent bd6e6ed403
commit 70eb3e6a56
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/action.c
View file

@ -232,13 +232,7 @@ static int get_action_worker(int context, int timeout,
/* Data from sys events can be pulled with button_get_data /* Data from sys events can be pulled with button_get_data
* multimedia button presses don't go through the action system */ * multimedia button presses don't go through the action system */
if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA)) if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA))
{
/* no button pressed so no point in waiting for release */
if (button == BUTTON_NONE)
wait_for_release = false;
return button; return button;
}
/* the special redraw button should result in a screen refresh */ /* the special redraw button should result in a screen refresh */
if (button == BUTTON_REDRAW) if (button == BUTTON_REDRAW)
return ACTION_REDRAW; return ACTION_REDRAW;

5
apps/gui/yesno.c
View file

@ -169,10 +169,9 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
screens[i].stop_scroll(); screens[i].stop_scroll();
gui_yesno_draw(&(yn[i])); gui_yesno_draw(&(yn[i]));
} }
/* make sure to eat any extranous keypresses */ /* make sure to eat any extranous keypresses */
while (get_action(CONTEXT_STD+99, TIMEOUT_NOBLOCK))
action_wait_for_release(); action_wait_for_release();
while (result==-1) while (result==-1)
{ {
/* Repeat the question every 5secs (more or less) */ /* Repeat the question every 5secs (more or less) */
@ -206,7 +205,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
result=YESNO_YES; result=YESNO_YES;
break; break;
case ACTION_NONE: case ACTION_NONE:
case ACTION_UNKNOWN:
case SYS_CHARGER_DISCONNECTED: case SYS_CHARGER_DISCONNECTED:
case SYS_BATTERY_UPDATE: case SYS_BATTERY_UPDATE:
/* ignore some SYS events that can happen */ /* ignore some SYS events that can happen */
@ -235,7 +233,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
screens[i].scroll_stop(yn[i].vp); screens[i].scroll_stop(yn[i].vp);
viewportmanager_theme_undo(i, true); viewportmanager_theme_undo(i, true);
} }
return(result); return(result);
} }