devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fixed draw bug. Removed wrapping.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@796 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-05-29 14:25:06 +00:00
parent 86a9ab2556
commit 4caebab366
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

@ -55,8 +55,6 @@ static void menu_draw(int m)
i++) { i++) {
lcd_puts(1, i-menus[m].top, menus[m].items[i].desc); lcd_puts(1, i-menus[m].top, menus[m].items[i].desc);
} }
lcd_puts(0, menus[m].cursor - menus[m].top, "-");
lcd_update(); lcd_update();
} }
@ -72,7 +70,7 @@ static void put_cursor(int m, int target)
menus[m].top--; menus[m].top--;
menu_draw(m); menu_draw(m);
} }
else if ( target > MENU_LINES-1 ) { else if ( target-menus[m].top > MENU_LINES-1 ) {
menus[m].top++; menus[m].top++;
menu_draw(m); menu_draw(m);
} }
@ -110,6 +108,7 @@ void menu_exit(int m)
void menu_run(int m) void menu_run(int m)
{ {
menu_draw(m); menu_draw(m);
lcd_puts(0, menus[m].cursor - menus[m].top, "-");
while(1) { while(1) {
switch( button_get(true) ) { switch( button_get(true) ) {
@ -118,10 +117,7 @@ void menu_run(int m)
#else #else
case BUTTON_LEFT: case BUTTON_LEFT:
#endif #endif
if (menus[m].cursor == 0) { if (menus[m].cursor) {
/* wrap around to menu bottom */
put_cursor(m, menus[m].itemcount-1);
} else {
/* move up */ /* move up */
put_cursor(m, menus[m].cursor-1); put_cursor(m, menus[m].cursor-1);
} }
@ -132,10 +128,7 @@ void menu_run(int m)
#else #else
case BUTTON_RIGHT: case BUTTON_RIGHT:
#endif #endif
if (menus[m].cursor == menus[m].itemcount-1) { if (menus[m].cursor < menus[m].itemcount-1) {
/* wrap around to menu top */
put_cursor(m, 0);
} else {
/* move down */ /* move down */
put_cursor(m, menus[m].cursor+1); put_cursor(m, menus[m].cursor+1);
} }
@ -152,6 +145,7 @@ void menu_run(int m)
/* Return to previous display state */ /* Return to previous display state */
menu_draw(m); menu_draw(m);
lcd_puts(0, menus[m].cursor - menus[m].top, "-");
break; break;
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD