diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/apps/menu.c b/apps/menu.c index aaa0c94ff6..0455ecd6e8 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -90,18 +90,17 @@ void menu_init(struct menu_items* mitems, int count) | |||
90 | menu_top = items[0].id; | 90 | menu_top = items[0].id; |
91 | menu_bottom = count-1; | 91 | menu_bottom = count-1; |
92 | cursor = menu_top; | 92 | cursor = menu_top; |
93 | #ifdef HAVE_LCD_BITMAP | ||
94 | lcd_setmargins(0,0); | ||
95 | lcd_setfont(0); | ||
96 | #endif | ||
97 | lcd_clear_display(); | ||
98 | lcd_update(); | ||
99 | } | 93 | } |
100 | 94 | ||
101 | void menu_draw(void) | 95 | void menu_draw(void) |
102 | { | 96 | { |
103 | int i = 0; | 97 | int i = 0; |
104 | 98 | ||
99 | lcd_clear_display(); | ||
100 | #ifdef HAVE_LCD_BITMAP | ||
101 | lcd_setmargins(0,0); | ||
102 | lcd_setfont(0); | ||
103 | #endif | ||
105 | for (i = 0; i < itemcount; i++) { | 104 | for (i = 0; i < itemcount; i++) { |
106 | lcd_puts(1, i, items[i].desc); | 105 | lcd_puts(1, i, items[i].desc); |
107 | if (i < menu_top) | 106 | if (i < menu_top) |
@@ -119,7 +118,6 @@ void menu_run(void) | |||
119 | int key; | 118 | int key; |
120 | 119 | ||
121 | menu_draw(); | 120 | menu_draw(); |
122 | put_cursor_menu_top(); | ||
123 | 121 | ||
124 | while(1) { | 122 | while(1) { |
125 | key = button_get(); | 123 | key = button_get(); |
@@ -167,7 +165,6 @@ void menu_run(void) | |||
167 | execute_menu_item(); | 165 | execute_menu_item(); |
168 | 166 | ||
169 | /* Return to previous display state */ | 167 | /* Return to previous display state */ |
170 | lcd_clear_display(); | ||
171 | menu_draw(); | 168 | menu_draw(); |
172 | break; | 169 | break; |
173 | 170 | ||