From 999918c4962de2ae2bf1acaab2f5f50024a259e1 Mon Sep 17 00:00:00 2001 From: scuri Date: Fri, 23 Oct 2009 19:01:28 +0000 Subject: Fixed: CanvasText for WD when using text with multiple lines. --- html/en/history.html | 6 ++++-- src/cd_text.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/html/en/history.html b/html/en/history.html index 795c285..8dd485a 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -19,7 +19,7 @@

History of Changes

CVS (20/Oct/2008)

CVS (23/Oct/2009)

Changed: Freetype updated to version 2.3.11.
Fixed: indexing of cdImageRGB, cdImageRGBA and cdBitmap objects in Lua.
Fixed: CanvasText + for WD when using text with multiple lines.

Version 5.2 (26/Jun/2008)

Version 5.2 (26/Jun/2009)

New: functions CanvasGetVectorTextBox, CanvasGetVectorFontSize and diff --git a/src/cd_text.c b/src/cd_text.c index 4b3e839..2568e25 100644 --- a/src/cd_text.c +++ b/src/cd_text.c @@ -166,6 +166,23 @@ void cdfCanvasText(cdCanvas* canvas, double x, double y, const char *s) else /* CD_CENTER || CD_EAST || CD_WEST */ /* it is relative to the full text */ cdfMovePoint(&x, &y, 0, (num_line-1)*line_height/2.0, sin_theta, cos_theta); } + else + { + int align = canvas->text_alignment; + + /* position vertically at the first line */ + if (align == CD_NORTH || align == CD_NORTH_EAST || align == CD_NORTH_WEST || /* it is relative to the full text */ + align == CD_BASE_LEFT || align == CD_BASE_CENTER || align == CD_BASE_RIGHT) /* it is relative to the first line already */ + { + /* Already at position */ + } + else if (align == CD_SOUTH || align == CD_SOUTH_EAST || align == CD_SOUTH_WEST) /* it is relative to the full text */ + { + y += (num_line-1)*line_height; + } + else /* CD_CENTER || CD_EAST || CD_WEST */ /* it is relative to the full text */ + y += ((num_line-1)*line_height)/2.0; + } p = s; for(i = 0; i < num_line; i++) -- cgit v1.2.3