From 0a8a5c9efcecbe2d6e3b2c3e301083b5d2091efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Sat, 14 Mar 2015 20:08:07 -0300 Subject: [PATCH] (RGUI) Fix color conversion --- menu/drivers/rgui.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 5b26bfea84..60653902ee 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -39,18 +39,18 @@ #define NORMAL_COLOR 0x7FFF #define TITLE_COLOR HOVER_COLOR #else -#define HOVER_COLOR (argb32_to_argb4444(g_settings.menu.entry_hover_color)) -#define NORMAL_COLOR (argb32_to_argb4444(g_settings.menu.entry_normal_color)) -#define TITLE_COLOR (argb32_to_argb4444(g_settings.menu.title_color)) +#define HOVER_COLOR (argb32_to_rgba4444(g_settings.menu.entry_hover_color)) +#define NORMAL_COLOR (argb32_to_rgba4444(g_settings.menu.entry_normal_color)) +#define TITLE_COLOR (argb32_to_rgba4444(g_settings.menu.title_color)) #endif -static inline uint16_t argb32_to_argb4444(uint32_t col) +static inline uint16_t argb32_to_rgba4444(uint32_t col) { unsigned r = (col & 0xff) >> 4; unsigned g = ((col >> 8) & 0xff) >> 4; unsigned b = ((col >> 16) & 0xff) >> 4; unsigned a = ((col >> 24) & 0xff) >> 4; - return r | g << 4 | b << 8 | a << 12; + return (r << 12) | (g << 8) | (b << 4) | a; } static int rgui_entry_iterate(unsigned action)