From f00f09a549bf106153122a23c3694ee3ac3f96bf Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 14 Feb 2016 21:12:06 -0500 Subject: [PATCH] fix input click --- deps/zahnrad/zahnrad.c | 1 - menu/drivers/wimp.c | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/deps/zahnrad/zahnrad.c b/deps/zahnrad/zahnrad.c index 663e075523..12245a1499 100644 --- a/deps/zahnrad/zahnrad.c +++ b/deps/zahnrad/zahnrad.c @@ -5938,7 +5938,6 @@ zr_input_button(struct zr_context *ctx, enum zr_buttons id, int x, int y, int do btn = &in->mouse.buttons[id]; btn->clicked_pos.x = (float)x; btn->clicked_pos.y = (float)y; - //printf("x:%d y:%d id:%d %d\n ", x , y, id, down); btn->down = down; btn->clicked++; } diff --git a/menu/drivers/wimp.c b/menu/drivers/wimp.c index d27765f75d..a57879d912 100644 --- a/menu/drivers/wimp.c +++ b/menu/drivers/wimp.c @@ -465,13 +465,9 @@ static void wimp_input_button(struct zr_context *ctx) { int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS); int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS); - - if (menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON)) - { - zr_input_button(ctx, ZR_BUTTON_LEFT, mouse_x, mouse_y, 1); - } - else if (menu_input_mouse_state(MENU_MOUSE_RIGHT_BUTTON)) - zr_input_button(ctx, ZR_BUTTON_RIGHT, mouse_x, mouse_y, 1); + + zr_input_button(ctx, ZR_BUTTON_LEFT, mouse_x, mouse_y, menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON)); + zr_input_button(ctx, ZR_BUTTON_RIGHT, mouse_x, mouse_y, menu_input_mouse_state(MENU_MOUSE_RIGHT_BUTTON)); } /* zahnrad code */ @@ -1415,9 +1411,6 @@ static void wimp_frame(void *data) /* zahnrad code */ - - - //printf("mouse state: %d %d %d\n", mouse_x, mouse_y, left); zr_input_begin(&gui.ctx); wimp_input_motion(&gui.ctx); wimp_input_button(&gui.ctx);