From d57447ad50b0886d2470333c6cb90774c86a41e5 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 12 May 2002 13:58:50 +0000 Subject: [PATCH] remember previous menu position when returning git-svn-id: svn://svn.rockbox.org/rockbox/trunk@556 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/app.c | 3 ++- uisimulator/menu.c | 7 +++++-- uisimulator/menu.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/uisimulator/app.c b/uisimulator/app.c index 7c28e7a3da..5c96ab8c43 100644 --- a/uisimulator/app.c +++ b/uisimulator/app.c @@ -37,6 +37,7 @@ void app_main(void) int key; menu_init(); + menu_draw(); put_cursor_menu_top(); while(1) { @@ -75,7 +76,7 @@ void app_main(void) /* Return to previous display state */ lcd_clear_display(); - menu_init(); + menu_draw(); break; case BUTTON_OFF: return; diff --git a/uisimulator/menu.c b/uisimulator/menu.c index 1619b33676..dcaa1f5fca 100644 --- a/uisimulator/menu.c +++ b/uisimulator/menu.c @@ -120,12 +120,15 @@ void add_menu_item(int location, char *string) void menu_init(void) { - int i = 0; - menu_top = Tetris; menu_bottom = Last_Id-1; menu_line_height = MENU_LINE_HEIGHT; cursor = menu_top; +} + +void menu_draw(void) +{ + int i = 0; for (i = i; i < Last_Id; i++) add_menu_item(items[i].menu_id, (char *) items[i].menu_desc); diff --git a/uisimulator/menu.h b/uisimulator/menu.h index 31dde95307..1e3075f7de 100644 --- a/uisimulator/menu.h +++ b/uisimulator/menu.h @@ -40,6 +40,7 @@ int is_cursor_menu_bottom(void); /* Menu calls */ void add_menu_item(int location, char *string); void menu_init(void); +void menu_draw(void); void execute_menu_item(void); #endif /* End __MENU_H__ */