From d4760c09c0298878b6514a3f00974864ef1ab918 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Thu, 24 Mar 2005 07:45:41 +0000 Subject: [project @ 2005-03-24 07:45:41 by bursa] Make line splitting more accurate by using rufl_split() instead of rufl_x_to_offset(). This fixes many cases of text leaking out of a box. svn path=/import/netsurf/; revision=1579 --- riscos/font.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/riscos/font.c b/riscos/font.c index 21d246ed8..3cbae5a23 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -325,17 +325,17 @@ bool nsfont_split(const struct css_style *style, nsfont_read_style(style, &font_family, &font_size, &font_style); - code = rufl_x_to_offset(font_family, font_style, font_size, + code = rufl_split(font_family, font_style, font_size, string, length, x * 2, char_offset, actual_x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_x_to_offset: rufl_FONT_MANAGER_ERROR: " + LOG(("rufl_split: rufl_FONT_MANAGER_ERROR: " "0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess)); else - LOG(("rufl_x_to_offset: 0x%x", code)); + LOG(("rufl_split: 0x%x", code)); /* warn_user("MiscError", "font error"); */ return false; } @@ -391,11 +391,11 @@ bool nsfont_paint(struct css_style *style, const char *string, string, length, x, y, rufl_BLEND_FONT); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s", + LOG(("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess)); else - LOG(("rufl_width: 0x%x", code)); + LOG(("rufl_paint: 0x%x", code)); } return true; -- cgit v1.2.3