use new colors (efh_text_html): ditto

2003-11-24  Radek Doulik  <rodo@ximian.com>

	* em-format-html.c (efh_text_plain): use new colors
	(efh_text_html): ditto

	* em-format-html-display.c (efhd_gtkhtml_realise): set new colors
	according to style

	* em-format-html.c (efh_init): init new colors

	* em-format-html.h: added frame and content colors

svn path=/trunk/; revision=23477

1 files changed, 25 insertions, 0 deletions

diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 3d57961537..ec606ec5d7 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -171,6 +171,31 @@ efhd_gtkhtml_realise(GtkHTML *html, EMFormatHTMLDisplay *efhd)
 
 		efhd->formathtml.body_colour = ((r<<16) | (g<< 8) | b) & 0xffffff;
 		
+#undef SCALE
+#define SCALE (174)
+		/* choose a suitably darker or lighter colour */
+		r = style->base[state].red >> 8;
+		g = style->base[state].green >> 8;
+		b = style->base[state].blue >> 8;
+
+		if (r+b+g > 128*3) {
+			r = (r*SCALE) >> 8;
+			g = (g*SCALE) >> 8;
+			b = (b*SCALE) >> 8;
+		} else {
+			r = 128 - ((SCALE * r) >> 9);
+			g = 128 - ((SCALE * g) >> 9);
+			b = 128 - ((SCALE * b) >> 9);
+		}
+
+		efhd->formathtml.frame_colour = ((r<<16) | (g<< 8) | b) & 0xffffff;
+
+		r = style->base[GTK_STATE_NORMAL].red >> 8;
+		g = style->base[GTK_STATE_NORMAL].green >> 8;
+		b = style->base[GTK_STATE_NORMAL].blue >> 8;
+
+		efhd->formathtml.content_colour = ((r<<16) | (g<< 8) | b) & 0xffffff;
+
 		r = style->text[state].red >> 8;
 		g = style->text[state].green >> 8;
 		b = style->text[state].blue >> 8;