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

Fixed touch handling with netloader msgbox. Swipe up can now be used to exit netloader. Added menuIsNetloaderActive().

Browse Source
This commit is contained in:
yellows8 2018-10-24 19:47:11 -04:00
parent 784dbc3623
commit 8888bff85f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/menu.c
View File

@ -83,6 +83,10 @@ void launchApplyThemeTask(menuEntry_s* arg) {
computeFrontGradient(themeCurrent.frontWaveColor, 280); computeFrontGradient(themeCurrent.frontWaveColor, 280);
} }
bool menuIsNetloaderActive(void) {
return hbmenu_state == HBMENU_NETLOADER_ACTIVE;
}
//Draws an RGB888 or RGBA8888 image. //Draws an RGB888 or RGBA8888 image.
static void drawImage(int x, int y, int width, int height, const uint8_t *image, ImageMode mode) { static void drawImage(int x, int y, int width, int height, const uint8_t *image, ImageMode mode) {
int tmpx, tmpy; int tmpx, tmpy;

2
common/menu.h
View File

@ -110,6 +110,8 @@ char *menuGetRootBasePath(void);
void menuHandleAButton(void); void menuHandleAButton(void);
bool menuIsNetloaderActive(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

8
nx_main/nx_touch.c
View File

@ -93,7 +93,9 @@ void handleTouch(menu_s* menu) {
int x2 = touchInfo.prevTouch.px; int x2 = touchInfo.prevTouch.px;
int y2 = touchInfo.prevTouch.py; int y2 = touchInfo.prevTouch.py;
if (menuIsMsgBoxOpen()) { bool netloader_active = menuIsNetloaderActive();
if (menuIsMsgBoxOpen() && !netloader_active) {
MessageBox currMsgBox = menuGetCurrentMsgBox(); MessageBox currMsgBox = menuGetCurrentMsgBox();
int start_x = 1280 / 2 - currMsgBox.width / 2; int start_x = 1280 / 2 - currMsgBox.width / 2;
int start_y = (720 / 2 - currMsgBox.height / 2) + (currMsgBox.height - 80); int start_y = (720 / 2 - currMsgBox.height / 2) + (currMsgBox.height - 80);
@ -103,7 +105,7 @@ void handleTouch(menu_s* menu) {
if (x1 > start_x && x1 < end_x && y1 > start_y && y1 < end_y && touchInfo.isTap) { if (x1 > start_x && x1 < end_x && y1 > start_y && y1 < end_y && touchInfo.isTap) {
menuCloseMsgBox(); menuCloseMsgBox();
} }
} else if (touchInfo.isTap) { } else if (touchInfo.isTap && !netloader_active) {
// App Icons // App Icons
if (y1 > LISTING_START_Y && y1 < LISTING_END_Y) { if (y1 > LISTING_START_Y && y1 < LISTING_END_Y) {
handleTappingOnApp(menu, touchInfo.prevTouch.px); handleTappingOnApp(menu, touchInfo.prevTouch.px);
@ -138,4 +140,4 @@ void handleTouch(menu_s* menu) {
touchInfo.gestureInProgress = false; touchInfo.gestureInProgress = false;
} }
} }