From 5fc7a6776b8145b00d68980d31392af09f15879c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Sat, 13 May 2017 14:17:55 +0200 Subject: [PATCH] (VITA) Fix problem with font renderer --- gfx/drivers_font/vita2d_font.c | 2 +- menu/drivers/materialui.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/gfx/drivers_font/vita2d_font.c b/gfx/drivers_font/vita2d_font.c index 80554993ad..87f903d27c 100644 --- a/gfx/drivers_font/vita2d_font.c +++ b/gfx/drivers_font/vita2d_font.c @@ -293,7 +293,7 @@ static void vita2d_font_render_msg( g = FONT_COLOR_GET_GREEN(params->color); b = FONT_COLOR_GET_BLUE(params->color); alpha = FONT_COLOR_GET_ALPHA(params->color); - color = params->color; + color = RGBA8(r,g,b,alpha); } else { diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index c0374cc2af..cd8c05aa38 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -673,11 +673,7 @@ static void mui_render_label_value(mui_handle_t *mui, mui_node_t *node, uintptr_t texture_switch = 0; bool do_draw_text = false; size_t usable_width = width - (mui->margin * 2); -#ifdef VITA - uint32_t sublabel_color = 0xff888888; -#else uint32_t sublabel_color = 0x888888ff; -#endif label_str[0] = value_str[0] = sublabel_str[0] = '\0'; @@ -969,15 +965,10 @@ static void mui_frame(void *data, video_frame_info_t *video_info) char title_buf[255]; char title_msg[255]; -#ifdef VITA - uint32_t black_opaque_54 = 0x8a000000; - uint32_t black_opaque_87 = 0xde000000; - uint32_t white_opaque_70 = 0xb3ffffff; -#else uint32_t black_opaque_54 = 0x0000008a; uint32_t black_opaque_87 = 0x000000de; uint32_t white_opaque_70 = 0xffffffb3; -#endif + /* https://material.google.com/style/color.html#color-color-palette */ /* Hex values converted to RGB normalized decimals, alpha set to 1 */ float blue_500[16] = {0};