LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'master' of https://github.com/AuroraWright/Luma3DS

Browse Source
This commit is contained in:
Aurora Wright 2017-08-17 17:33:37 +02:00
commit 3f356da879
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysmodules/rosalina/source/menu.c
View File

@ -272,6 +272,7 @@ void menuShow(Menu *root)
Menu *currentMenu = root; Menu *currentMenu = root;
u32 nbPreviousMenus = 0; u32 nbPreviousMenus = 0;
Menu *previousMenus[0x80]; Menu *previousMenus[0x80];
u32 previousSelectedItems[0x80];
Draw_Lock(); Draw_Lock();
Draw_ClearFramebuffer(); Draw_ClearFramebuffer();
@ -297,6 +298,7 @@ void menuShow(Menu *root)
currentMenu->items[selectedItem].method(); currentMenu->items[selectedItem].method();
break; break;
case MENU: case MENU:
previousSelectedItems[nbPreviousMenus] = selectedItem;
previousMenus[nbPreviousMenus++] = currentMenu; previousMenus[nbPreviousMenus++] = currentMenu;
currentMenu = currentMenu->items[selectedItem].menu; currentMenu = currentMenu->items[selectedItem].menu;
selectedItem = 0; selectedItem = 0;
@ -316,7 +318,10 @@ void menuShow(Menu *root)
Draw_Unlock(); Draw_Unlock();
if(nbPreviousMenus > 0) if(nbPreviousMenus > 0)
{
currentMenu = previousMenus[--nbPreviousMenus]; currentMenu = previousMenus[--nbPreviousMenus];
selectedItem = previousSelectedItems[nbPreviousMenus];
}
else else
break; break;
} }