From cdfc2ffd59303a368fc40beb6c9631e84d71209f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 25 Oct 2015 04:04:46 +0100 Subject: [PATCH] Implement MENU_POINTER_PRESSED --- menu/drivers/zarch.c | 4 +++- menu/menu_input.c | 2 ++ menu/menu_input.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 8bf48d942c..cb14b679ae 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -232,7 +232,7 @@ static int16_t zarch_zui_input_state(enum zarch_zui_input_state state) case MENU_ZARCH_Y: break; case MENU_ZARCH_PRESSED: - if (menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON)) + if (menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON) || menu_input_pointer_state(MENU_POINTER_PRESSED)) return 1; break; } @@ -387,6 +387,8 @@ static void zarch_zui_snow(zui_t *zui) p->x += zarch_zui_scalef(mouse_x, 0, zui->width, -0.3, 0.3) + p->xspeed; p->alive = p->y >= 0 && p->y < (int)zui->height && p->x >= 0 && p->x < (int)zui->width; + + } else if (max_gen > 0 && timeout <= 0) { diff --git a/menu/menu_input.c b/menu/menu_input.c index 1d44c1b5a1..f30318b1a1 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1038,6 +1038,8 @@ int16_t menu_input_pointer_state(enum menu_input_pointer_state state) return menu->pointer.dx; case MENU_POINTER_DELTA_Y_AXIS: return menu->pointer.dy; + case MENU_POINTER_PRESSED: + return menu->pointer.pressed[0]; } return 0; diff --git a/menu/menu_input.h b/menu/menu_input.h index b49446a31d..5085ff8b57 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -62,7 +62,8 @@ enum menu_input_pointer_state MENU_POINTER_X_AXIS = 0, MENU_POINTER_Y_AXIS, MENU_POINTER_DELTA_X_AXIS, - MENU_POINTER_DELTA_Y_AXIS + MENU_POINTER_DELTA_Y_AXIS, + MENU_POINTER_PRESSED }; enum menu_input_mouse_state