ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add menu_input_mouse_check_hitbox

This commit is contained in:
twinaphex 2015-10-24 03:19:06 +02:00
parent 579eb3cd72
commit cc6cd51afa
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/drivers/zarch.c
View File

@ -281,18 +281,10 @@ static void zui_finish(zui_t *zui,
zui->rendering = false;
}
static bool check_hitbox(zui_t *zui, int x1, int y1, int x2, int y2)
{
int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS);
return ((mouse_x >= x1) && (mouse_x <= x2) && (mouse_y >= y1) && (mouse_y <= y2));
}
static bool check_button_down(zui_t *zui, unsigned id, int x1, int y1, int x2, int y2)
{
bool result = false;
bool inside = check_hitbox(zui, x1, y1, x2, y2);
bool inside = menu_input_mouse_check_hitbox(x1, y1, x2, y2);
if (inside)
zui->item.hot = id;
@ -309,7 +301,7 @@ static bool check_button_down(zui_t *zui, unsigned id, int x1, int y1, int x2, i
static bool check_button_up(zui_t *zui, unsigned id, int x1, int y1, int x2, int y2)
{
bool result = false;
bool inside = check_hitbox(zui, x1, y1, x2, y2);
bool inside = menu_input_mouse_check_hitbox(x1, y1, x2, y2);
if (inside)
zui->item.hot = id;

8
menu/menu_input.c
View File

@ -1064,6 +1064,14 @@ int16_t menu_input_pointer_state(enum menu_input_pointer_state state)
return 0;
}
bool menu_input_mouse_check_hitbox(int x1, int y1, int x2, int y2)
{
int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS);
return ((mouse_x >= x1) && (mouse_x <= x2) && (mouse_y >= y1) && (mouse_y <= y2));
}
int16_t menu_input_mouse_state(enum menu_input_mouse_state state)
{
menu_input_t *menu = menu_input_get_ptr();

3
menu/menu_input.h
View File

@ -134,8 +134,9 @@ int16_t menu_input_pointer_state(enum menu_input_pointer_state state);
int16_t menu_input_mouse_state(enum menu_input_mouse_state state);
bool menu_input_ctl(enum menu_input_ctl_state state, void *data);
bool menu_input_mouse_check_hitbox(int x1, int y1, int x2, int y2);
bool menu_input_ctl(enum menu_input_ctl_state state, void *data);
void menu_input_free(void);