Make the main menu destroy itself on exit.

This commit is contained in:
Steven Smith 2016-02-18 18:03:40 -08:00
parent f554c7f2a1
commit e1fd4f7b09
3 changed files with 6 additions and 13 deletions

View File

@ -60,8 +60,7 @@ int main(int argc, const char* argv[]) {
screen_init(); screen_init();
task_init(); task_init();
ui_view* mainmenu = mainmenu_create(); mainmenu_open();
ui_push(mainmenu);
while(aptMainLoop()) { while(aptMainLoop()) {
ui_update(); ui_update();
@ -72,8 +71,6 @@ int main(int argc, const char* argv[]) {
ui_draw(); ui_draw();
} }
mainmenu_destroy(mainmenu);
cleanup(); cleanup();
return 0; return 0;
} }

View File

@ -48,6 +48,7 @@ static void mainmenu_draw_top(ui_view* view, void* data, float x1, float y1, flo
static void mainmenu_update(ui_view* view, void* data, list_item** items, u32** itemCount, list_item* selected, bool selectedTouched) { static void mainmenu_update(ui_view* view, void* data, list_item** items, u32** itemCount, list_item* selected, bool selectedTouched) {
if(hidKeysDown() & KEY_START) { if(hidKeysDown() & KEY_START) {
ui_pop(); ui_pop();
list_destroy(view);
return; return;
} }
@ -62,10 +63,6 @@ static void mainmenu_update(ui_view* view, void* data, list_item** items, u32**
} }
} }
ui_view* mainmenu_create() { void mainmenu_open() {
return list_create("Main Menu", "A: Select, START: Exit", NULL, mainmenu_update, mainmenu_draw_top); ui_push(list_create("Main Menu", "A: Select, START: Exit", NULL, mainmenu_update, mainmenu_draw_top));
}
void mainmenu_destroy(ui_view* view) {
list_destroy(view);
} }

View File

@ -2,5 +2,4 @@
#include "ui.h" #include "ui.h"
ui_view* mainmenu_create(); void mainmenu_open();
void mainmenu_destroy(ui_view* view);