From 99d4fb35295e4076124d2d223b6549c1098a8e46 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 31 Jan 2004 23:00:17 +0000 Subject: [project @ 2004-01-31 23:00:17 by jmb] Fix text-decoration colours again. svn path=/import/netsurf/; revision=525 --- riscos/htmlredraw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'riscos') diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c index 273a2a727..108e2029a 100644 --- a/riscos/htmlredraw.c +++ b/riscos/htmlredraw.c @@ -302,30 +302,30 @@ void html_redraw_box(struct content *content, struct box * box, os_plot(os_PLOT_SOLID_EX_END | os_PLOT_BY, box->width * 2, 0); } if (box->parent->parent->style->text_decoration & CSS_TEXT_DECORATION_UNDERLINE && box->parent->parent->type == BOX_BLOCK) { - os_set_colour(0, box->parent->parent->style->color); + colourtrans_set_gcol((unsigned int)box->parent->parent->style->color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); os_plot(os_MOVE_TO, x, y - (int) (box->height * 1.8)); os_plot(os_PLOT_SOLID_EX_END | os_PLOT_BY, box->width * 2, 0); - os_set_colour(0, box->style->color); + colourtrans_set_gcol((unsigned int)box->style->color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); } if (box->style->text_decoration & CSS_TEXT_DECORATION_OVERLINE) { os_plot(os_MOVE_TO, x, y - (int) (box->height * 0.2)); os_plot(os_PLOT_SOLID_EX_END | os_PLOT_BY, box->width * 2, 0); } if (box->parent->parent->style->text_decoration & CSS_TEXT_DECORATION_OVERLINE && box->parent->parent->type == BOX_BLOCK) { - os_set_colour(0, box->parent->parent->style->color); + colourtrans_set_gcol((unsigned int)box->parent->parent->style->color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); os_plot(os_MOVE_TO, x, y - (int) (box->height * 0.2)); os_plot(os_PLOT_SOLID_EX_END | os_PLOT_BY, box->width * 2, 0); - os_set_colour(0, box->style->color); + colourtrans_set_gcol((unsigned int)box->style->color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); } if (box->style->text_decoration & CSS_TEXT_DECORATION_LINE_THROUGH) { os_plot(os_MOVE_TO, x, y - (int) (box->height * 1.0)); os_plot(os_PLOT_SOLID_EX_END | os_PLOT_BY, box->width * 2, 0); } if (box->parent->parent->style->text_decoration & CSS_TEXT_DECORATION_LINE_THROUGH && box->parent->parent->type == BOX_BLOCK) { - os_set_colour(0, box->parent->parent->style->color); + colourtrans_set_gcol((unsigned int)box->parent->parent->style->color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); os_plot(os_MOVE_TO, x, y - (int) (box->height * 1.0)); os_plot(os_PLOT_SOLID_EX_END | os_PLOT_BY, box->width * 2, 0); - os_set_colour(0, box->style->color); + colourtrans_set_gcol((unsigned int)box->style->color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); } font_paint(box->font->handle, box->text, -- cgit v1.2.3