mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Can now escape 'Help' message with the mouse by pressing right mouse

Browse Source 
button
This commit is contained in:
twinaphex 2015-05-11 23:02:31 +02:00
parent 76407c9ef2
commit fdcef6cfc2
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/menu_entries_cbs_iterate.c
View File

@ -141,6 +141,7 @@ static int load_or_open_zip_iterate(unsigned action)
static int action_iterate_help(const char *label, unsigned action) static int action_iterate_help(const char *label, unsigned action)
{ {
int ret;
unsigned i; unsigned i;
static const unsigned binds[] = { static const unsigned binds[] = {
RETRO_DEVICE_ID_JOYPAD_UP, RETRO_DEVICE_ID_JOYPAD_UP,
@ -203,6 +204,8 @@ static int action_iterate_help(const char *label, unsigned action)
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
menu_list_pop(menu->menu_list->menu_stack, NULL); menu_list_pop(menu->menu_list->menu_stack, NULL);
menu_input_post_iterate(&ret, action);
return 0; return 0;
} }

12
menu/menu_input.c
View File

@ -702,18 +702,6 @@ static int menu_input_pointer(unsigned *action)
return 0; return 0;
} }
enum mouse_action
{
MOUSE_ACTION_NONE = 0,
MOUSE_ACTION_BUTTON_L,
MOUSE_ACTION_BUTTON_L_OK,
MOUSE_ACTION_BUTTON_L_TOGGLE,
MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
MOUSE_ACTION_BUTTON_R,
MOUSE_ACTION_WHEEL_UP,
MOUSE_ACTION_WHEEL_DOWN,
};
static int menu_input_mouse_frame( static int menu_input_mouse_frame(
menu_file_list_cbs_t *cbs, menu_entry_t *entry, menu_file_list_cbs_t *cbs, menu_entry_t *entry,
uint64_t input_mouse) uint64_t input_mouse)

12
menu/menu_input.h
View File

@ -44,6 +44,18 @@ typedef enum
MENU_ACTION_NOOP MENU_ACTION_NOOP
} menu_action_t; } menu_action_t;
enum mouse_action
{
MOUSE_ACTION_NONE = 0,
MOUSE_ACTION_BUTTON_L,
MOUSE_ACTION_BUTTON_L_OK,
MOUSE_ACTION_BUTTON_L_TOGGLE,
MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
MOUSE_ACTION_BUTTON_R,
MOUSE_ACTION_WHEEL_UP,
MOUSE_ACTION_WHEEL_DOWN,
};
enum menu_input_bind_mode enum menu_input_bind_mode
{ {
MENU_INPUT_BIND_NONE, MENU_INPUT_BIND_NONE,