From 6f33e2d42e8cbcc539ac34e5e696ac127f72e4e3 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 18 Oct 2003 00:24:53 +0000 Subject: [project @ 2003-10-18 00:24:53 by jmb] Miscellaneous fixes. svn path=/import/netsurf/; revision=370 --- riscos/htmlredraw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c index 1d0ff59d7..f9569ea95 100644 --- a/riscos/htmlredraw.c +++ b/riscos/htmlredraw.c @@ -283,13 +283,14 @@ void html_redraw_box(struct content *content, struct box * box, colourtrans_set_font_colours(box->font->handle, current_background_color << 8, box->style->color << 8, 14, 0, 0, 0); - if (box->style->text_decoration == CSS_TEXT_DECORATION_NONE) { + if (box->style->text_decoration == CSS_TEXT_DECORATION_NONE || + box->style->text_decoration == CSS_TEXT_DECORATION_BLINK) { font_paint(box->font->handle, box->text, font_OS_UNITS | font_GIVEN_FONT | font_KERN | font_GIVEN_LENGTH, x, y - (int) (box->height * 1.5), NULL, NULL, (int) box->length); } - else if (box->style->text_decoration == CSS_TEXT_DECORATION_UNDERLINE) { + if (box->style->text_decoration == CSS_TEXT_DECORATION_UNDERLINE) { char ulctrl[3]; char *temp = xcalloc(strlen(box->text)+4, sizeof(char)); @@ -299,10 +300,10 @@ void html_redraw_box(struct content *content, struct box * box, font_paint(box->font->handle, temp, font_OS_UNITS | font_GIVEN_FONT | font_KERN | font_GIVEN_LENGTH, x, y - (int) (box->height * 1.5), - NULL, NULL, (int) box->length + 4); + NULL, NULL, (int) box->length + 3); xfree(temp); } - else if (box->style->text_decoration == CSS_TEXT_DECORATION_LINE_THROUGH){ + if (box->style->text_decoration == CSS_TEXT_DECORATION_LINE_THROUGH){ char ulctrl[3]; char *temp = xcalloc(strlen(box->text)+4, sizeof(char)); @@ -312,10 +313,10 @@ void html_redraw_box(struct content *content, struct box * box, font_paint(box->font->handle, temp, font_OS_UNITS | font_GIVEN_FONT | font_KERN | font_GIVEN_LENGTH, x, y - (int) (box->height * 1.5), - NULL, NULL, (int) box->length + 4); + NULL, NULL, (int) box->length + 3); xfree(temp); } - else { + if (box->style->text_decoration == CSS_TEXT_DECORATION_OVERLINE) { char ulctrl[3]; char *temp = xcalloc(strlen(box->text)+4, sizeof(char)); @@ -325,7 +326,7 @@ void html_redraw_box(struct content *content, struct box * box, font_paint(box->font->handle, temp, font_OS_UNITS | font_GIVEN_FONT | font_KERN | font_GIVEN_LENGTH, x, y - (int) (box->height * 1.5), - NULL, NULL, (int) box->length + 4); + NULL, NULL, (int) box->length + 3); xfree(temp); } } else { -- cgit v1.2.3