mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup menu_display_draw_cursor

Browse Source
This commit is contained in:
twinaphex 2016-04-21 05:08:36 +02:00
parent af976d5da3
commit 9ba0cbfac7
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/drivers/materialui.c
View File

@ -975,16 +975,14 @@ static void mui_frame(void *data)
mui->box_message[0] = '\0'; mui->box_message[0] = '\0';
} }
if (settings->menu.mouse.enable && (settings->video.fullscreen menu_display_draw_cursor(
|| !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL))) &white_bg[0],
menu_display_draw_cursor( mui->cursor.size,
&white_bg[0], mui->textures.list[MUI_TEXTURE_POINTER],
mui->cursor.size, menu_input_mouse_state(MENU_MOUSE_X_AXIS),
mui->textures.list[MUI_TEXTURE_POINTER], menu_input_mouse_state(MENU_MOUSE_Y_AXIS),
menu_input_mouse_state(MENU_MOUSE_X_AXIS), width,
menu_input_mouse_state(MENU_MOUSE_Y_AXIS), height);
width,
height);
menu_display_ctl(MENU_DISPLAY_CTL_RESTORE_CLEAR_COLOR, NULL); menu_display_ctl(MENU_DISPLAY_CTL_RESTORE_CLEAR_COLOR, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL); menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL);

20
menu/drivers/xmb.c
View File

@ -48,7 +48,7 @@
#include "../../tasks/tasks_internal.h" #include "../../tasks/tasks_internal.h"
#if 1 #if 0
#define XMB_RIBBON_ENABLE #define XMB_RIBBON_ENABLE
#define XMB_RIBBON_ROWS 16 #define XMB_RIBBON_ROWS 16
#define XMB_RIBBON_COLS 32 #define XMB_RIBBON_COLS 32
@ -2040,16 +2040,14 @@ static void xmb_frame(void *data)
menu_display_set_alpha(coord_color2, 1.00f > xmb->alpha ? xmb->alpha : 1.00f); menu_display_set_alpha(coord_color2, 1.00f > xmb->alpha ? xmb->alpha : 1.00f);
if ( settings->menu.mouse.enable && (settings->video.fullscreen menu_display_draw_cursor(
|| !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL))) &coord_color2[0],
menu_display_draw_cursor( xmb->cursor.size,
&coord_color2[0], xmb->textures.list[XMB_TEXTURE_POINTER],
xmb->cursor.size, menu_input_mouse_state(MENU_MOUSE_X_AXIS),
xmb->textures.list[XMB_TEXTURE_POINTER], menu_input_mouse_state(MENU_MOUSE_Y_AXIS),
menu_input_mouse_state(MENU_MOUSE_X_AXIS), width,
menu_input_mouse_state(MENU_MOUSE_Y_AXIS), height);
width,
height);
menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL); menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL);
} }

8
menu/menu_display.c
View File

@ -662,6 +662,14 @@ void menu_display_draw_cursor(
{ {
menu_display_ctx_draw_t draw; menu_display_ctx_draw_t draw;
struct gfx_coords coords; struct gfx_coords coords;
settings_t *settings = config_get_ptr();
bool cursor_visible = settings->video.fullscreen ||
!video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL);
if ( !settings->menu.mouse.enable)
return;
if (!cursor_visible)
return;
coords.vertices = 4; coords.vertices = 4;
coords.vertex = NULL; coords.vertex = NULL;