From da448b73cc1d103d9fdb4829b2f731514834bce3 Mon Sep 17 00:00:00 2001 From: scuri Date: Tue, 1 Dec 2009 17:25:49 +0000 Subject: Fixed: text alignment in the Windows base driver when WriteMode=XOR. --- html/en/history.html | 4 +++- src/win32/cdwin.c | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/html/en/history.html b/html/en/history.html index 0a04acc..7464f1d 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -19,7 +19,7 @@

History of Changes

CVS (27/Nov/2009)

CVS (01/Dec/2009)

Changed: Freetype updated to version 2.3.11.

CanvasFont

Fixed: improved support for line endings at cdPlay in the METAFILE driver.
Fixed: text alignment in the Windows + base driver when WriteMode=XOR.

Version 5.2 (26/Jun/2009)

diff --git a/src/win32/cdwin.c b/src/win32/cdwin.c index 371bb6d..57c07b9 100644 --- a/src/win32/cdwin.c +++ b/src/win32/cdwin.c @@ -997,8 +997,6 @@ static void sTextOutBlt(cdCtxCanvas* ctxcanvas, int px, int py, const char* s, i /* calcula o alinhamento da imagem no canvas */ if (ctxcanvas->canvas->text_orientation != 0) { - double d = sqrt(wt*wt + ht*ht); - switch (ctxcanvas->canvas->text_alignment) { case CD_CENTER: @@ -1034,20 +1032,20 @@ static void sTextOutBlt(cdCtxCanvas* ctxcanvas, int px, int py, const char* s, i px_off = (int)(wt/2 * cos_teta); break; case CD_NORTH_EAST: - py_off = (int)(h/2); - px_off = - (int)(sqrt(d*d - h*h)/2); - break; - case CD_NORTH_WEST: - py_off = (int)(sqrt(d*d - w*w)/2); - px_off = - (int)(w/2); + py_off = (int)(ht/2 * cos_teta + wt/2 * sin_teta); + px_off = (int)(ht/2 * sin_teta - wt/2 * cos_teta); break; case CD_SOUTH_WEST: - py_off = - (int)(h/2); - px_off = (int)(sqrt(d*d - h*h)/2); + py_off = - (int)(ht/2 * cos_teta + wt/2 * sin_teta); + px_off = - (int)(ht/2 * sin_teta - wt/2 * cos_teta); + break; + case CD_NORTH_WEST: + py_off = (int)(ht/2 * cos_teta - wt/2 * sin_teta); + px_off = (int)(ht/2 * sin_teta + wt/2 * cos_teta); break; case CD_SOUTH_EAST: - py_off = - (int)(sqrt(d*d - w*w)/2); - px_off = (int)(w/2); + py_off = - (int)(ht/2 * cos_teta - wt/2 * sin_teta); + px_off = - (int)(ht/2 * sin_teta + wt/2 * cos_teta); break; } } @@ -1095,7 +1093,7 @@ static void sTextOutBlt(cdCtxCanvas* ctxcanvas, int px, int py, const char* s, i case CD_CENTER: case CD_EAST: case CD_WEST: - py_off = py; + py_off = 0; break; } } -- cgit v1.2.3