From 5ff7f53cc60781dfb7dcb0cd7cb5cea190b42b6f Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sun, 9 Oct 2011 15:04:16 -0400 Subject: modify scaling of vertical offset for text placement (Bug 868594) Fixed bugs: - https://launchpad.net/bugs/868594 (bzr r10674) --- src/extension/internal/emf-win32-inout.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp index f66209479..ceebc2727 100644 --- a/src/extension/internal/emf-win32-inout.cpp +++ b/src/extension/internal/emf-win32-inout.cpp @@ -1837,16 +1837,16 @@ myEnhMetaFileProc(HDC /*hDC*/, HANDLETABLE * /*lpHTable*/, ENHMETARECORD const * y1 = d->dc[d->level].cur.y; } + double x = pix_to_x_point(d, x1, y1); + double y = pix_to_y_point(d, x1, y1); + if (!(d->dc[d->level].textAlign & TA_BOTTOM)) if (d->dc[d->level].style.baseline_shift.value) { - x1 += std::sin(d->dc[d->level].style.baseline_shift.value*M_PI/180.0)*fabs(d->dc[d->level].style.font_size.computed); - y1 += std::cos(d->dc[d->level].style.baseline_shift.value*M_PI/180.0)*fabs(d->dc[d->level].style.font_size.computed); + x += std::sin(d->dc[d->level].style.baseline_shift.value*M_PI/180.0)*fabs(d->dc[d->level].style.font_size.computed); + y += std::cos(d->dc[d->level].style.baseline_shift.value*M_PI/180.0)*fabs(d->dc[d->level].style.font_size.computed); } else - y1 += fabs(d->dc[d->level].style.font_size.computed); - - double x = pix_to_x_point(d, x1, y1); - double y = pix_to_y_point(d, x1, y1); + y += fabs(d->dc[d->level].style.font_size.computed); wchar_t *wide_text = (wchar_t *) ((char *) pEmr + pEmr->emrtext.offString); -- cgit v1.2.3