summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-02-20 22:18:35 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-02-20 22:18:35 +0000
commitf8c5eeb70a40d03743bb746341de18cf79fad797 (patch)
treecb40c5fcbed87200b3447a26d1284d3e708d2c56 /desktop
parent675a07083acbfd276c4d80fbf5df4d18fb8e5742 (diff)
downloadnetsurf-f8c5eeb70a40d03743bb746341de18cf79fad797.tar.gz
netsurf-f8c5eeb70a40d03743bb746341de18cf79fad797.tar.bz2
Fix colour component combination. Render text as valid #xxxxxx too.
svn path=/trunk/netsurf/; revision=11737
Diffstat (limited to 'desktop')
-rw-r--r--desktop/options.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/options.c b/desktop/options.c
index 4176080c9..d57c256a9 100644
--- a/desktop/options.c
+++ b/desktop/options.c
@@ -529,13 +529,13 @@ int snoptionf(char *string, size_t size, unsigned int option, const char *fmt)
break;
case OPTION_COLOUR:
- rgbcolour = ((0x000000FF | *((colour *)
- option_entry->p)) << 16) &
- ((0x0000FF00 | *((colour *)
- option_entry->p)) << 0) &
- ((0x00FF0000 | *((colour *)
+ rgbcolour = ((0x000000FF & *((colour *)
+ option_entry->p)) << 16) |
+ ((0x0000FF00 & *((colour *)
+ option_entry->p)) << 0) |
+ ((0x00FF0000 & *((colour *)
option_entry->p)) >> 16);
- slen += snprintf(string + slen, size - slen, "<span style=\"background-color: #%06x; color: #%06x;\">%x</span>", rgbcolour, (~rgbcolour) & 0xffffff, rgbcolour);
+ slen += snprintf(string + slen, size - slen, "<span style=\"background-color: #%06x; color: #%06x;\">#%06x</span>", rgbcolour, (~rgbcolour) & 0xffffff, rgbcolour);
break;
case OPTION_STRING: