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

Backport/rewrites wmarquesr pt. 8

This commit is contained in:
twinaphex 2015-12-04 11:06:33 +01:00
parent 20c506fa26
commit b280d25f8a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/menu_input.c
View File

@ -892,16 +892,18 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
unsigned header_height; unsigned header_height;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
bool check_overlay = settings ? !settings->menu.mouse.enable: false;
*input_mouse = MOUSE_ACTION_NONE; *input_mouse = MOUSE_ACTION_NONE;
menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection);
if (!settings->menu.mouse.enable
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
|| (settings->input.overlay_enable && input_overlay_is_alive()) check_overlay = check_overlay ||
(settings->input.overlay_enable && input_overlay_is_alive());
#endif #endif
)
if (check_overlay)
{ {
menu_input->mouse.wheeldown = false; menu_input->mouse.wheeldown = false;
menu_input->mouse.wheelup = false; menu_input->mouse.wheelup = false;