mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved code for handling A-button from nx_main/pc_main into a dedicated func, which now only handles menu entries when hbmenu_state isn't netloader. Removed old code.

Browse Source
This commit is contained in:
yellows8 2018-09-29 17:57:32 -04:00
parent 69e11599f4
commit d39efdaee1
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/menu.c
View File

@ -54,6 +54,22 @@ void launchMenuBackTask() {
} }
void menuHandleAButton(void) {
menu_s* menu = menuGetCurrent();
if (menuIsMsgBoxOpen()) {
menuCloseMsgBox();
}
else if (menu->nEntries > 0 && (hbmenu_state == HBMENU_DEFAULT || hbmenu_state == HBMENU_THEME_MENU))
{
int i;
menuEntry_s* me;
for (i = 0, me = menu->firstEntry; i != menu->curEntry; i ++, me = me->next);
launchMenuEntryTask(me);
//workerSchedule(launchMenuEntryTask, me);
}
}
void launchApplyThemeTask(menuEntry_s* arg) { void launchApplyThemeTask(menuEntry_s* arg) {
const char* themePath = arg->path; const char* themePath = arg->path;
SetThemePathToConfig(themePath); SetThemePathToConfig(themePath);

1
common/menu.h
View File

@ -93,6 +93,7 @@ void launchMenuBackTask();
void launchMenuNetloaderTask(); void launchMenuNetloaderTask();
char *menuGetRootPath(); char *menuGetRootPath();
void menuHandleAButton(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

16
nx_main/main.c
View File

@ -119,17 +119,7 @@ bool menuUpdate(void) {
} }
else if (down & KEY_A) else if (down & KEY_A)
{ {
if (menuIsMsgBoxOpen()) { menuHandleAButton();
menuCloseMsgBox();
}
else if (menu->nEntries > 0)
{
int i;
menuEntry_s* me;
for (i = 0, me = menu->firstEntry; i != menu->curEntry; i ++, me = me->next);
launchMenuEntryTask(me);
//workerSchedule(launchMenuEntryTask, me);
}
} }
else if (down & KEY_B) else if (down & KEY_B)
{ {
@ -142,10 +132,6 @@ bool menuUpdate(void) {
{ {
exitflag = 1; exitflag = 1;
} }
/*else if (down & KEY_Y)
{
workerSchedule(netloaderTask, NULL);
}*/
else if (menu->nEntries > 0) else if (menu->nEntries > 0)
{ {
int move = 0; int move = 0;

12
pc_main/main.cpp
View File

@ -84,17 +84,7 @@ extern "C" bool menuUpdate(void) {
} }
else if (!new_return_state && return_state) else if (!new_return_state && return_state)
{ {
if (menuIsMsgBoxOpen()) { menuHandleAButton();
menuCloseMsgBox();
}
else if (menu->nEntries > 0)
{
int i;
menuEntry_s* me;
for (i = 0, me = menu->firstEntry; i != menu->curEntry; i ++, me = me->next);
launchMenuEntryTask(me);
//workerSchedule(launchMenuEntryTask, me);
}
} }
else if (menu->nEntries > 0) else if (menu->nEntries > 0)
{ {