Merge pull request #2881 from lakkatv/master

(XMB) Ribbon alpha improvements
This commit is contained in:
Twinaphex 2016-04-20 23:45:03 +02:00
commit 39305b920c
2 changed files with 6 additions and 10 deletions

View File

@ -509,8 +509,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
coords.lut_tex_coord = new_tex_coord;
coords.color = (const float*)draw->color;
if (!draw->dont_replace_coords)
draw->coords = &coords;
draw->coords = &coords;
if (!draw->texture)
draw->texture = menu_display_white_texture;
@ -527,10 +526,13 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
1, 0, 0.1, 1,
1, 0.1, 0, 1,
0.05, 0, 0.05, 1,
0.05, 0, 0.05, 1
0.05, 0, 0.05, 1
};
bg[3] = bg[7] = bg[11] = bg[15] = draw->handle_alpha;
bg[3] = draw->color[3];
bg[7] = draw->color[7];
bg[11] = draw->color[11];
bg[15] = draw->color[15];
draw->color = bg;
draw->texture = 0;
@ -550,11 +552,6 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
menu_display_ctl(MENU_DISPLAY_CTL_COORDS_ARRAY_GET, &ca);
if (menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL))
draw->handle_alpha = 0.75;
else
draw->handle_alpha = 0.90;
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, draw);
draw->x = 0;

View File

@ -113,7 +113,6 @@ typedef struct menu_display_ctx_draw
float y;
unsigned width;
unsigned height;
bool dont_replace_coords;
struct gfx_coords *coords;
void *matrix_data;
uintptr_t texture;