From f0dbe1d689edbb61c6dd9933ab1cfb61e10b336c Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 27 Mar 2012 19:25:02 +0000 Subject: Return a colour (ABGR) from gui_system_colour_char() rather than a css_color (ARGB) svn path=/trunk/netsurf/; revision=13744 --- amiga/system_colour.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/amiga/system_colour.c b/amiga/system_colour.c index 8ea0ab3d3..c9be5ad4c 100644 --- a/amiga/system_colour.c +++ b/amiga/system_colour.c @@ -241,7 +241,7 @@ static struct gui_system_colour_ctx colour_list[] = { SLEN("WindowText"), 0xff000000, &nsoption_colour(sys_colour_WindowText), - INACTIVEFILLTEXTPEN, + TEXTPEN, NULL }, @@ -307,6 +307,11 @@ void gui_system_colour_finalize(void) gui_system_colour_pw = NULL; } +colour ami_css_color_to_colour(css_color c) +{ + return (c & 0xFF00FF00) | ((c >> 16) & 0xFF) | ((c & 0xFF) << 16); +} + colour gui_system_colour_char(const char *name) { colour ret = 0xff00000; @@ -314,7 +319,7 @@ colour gui_system_colour_char(const char *name) for (ccount = 0; ccount < colour_list_len; ccount++) { if (strcmp(name, colour_list[ccount].name) == 0) { - ret = colour_list[ccount].colour; + ret = ami_css_color_to_colour(colour_list[ccount].colour); break; } } -- cgit v1.2.3