diff options
| author | Alvin Penner <penner@vaxxine.com> | 2011-10-09 19:04:16 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2011-10-09 19:04:16 +0000 |
| commit | 5ff7f53cc60781dfb7dcb0cd7cb5cea190b42b6f (patch) | |
| tree | 705c3c1a6b14dc27c060b119225a574e85e2c3b9 | |
| parent | update cmake file lists (diff) | |
| download | inkscape-5ff7f53cc60781dfb7dcb0cd7cb5cea190b42b6f.tar.gz inkscape-5ff7f53cc60781dfb7dcb0cd7cb5cea190b42b6f.zip | |
modify scaling of vertical offset for text placement (Bug 868594)
Fixed bugs:
- https://launchpad.net/bugs/868594
(bzr r10674)
| -rw-r--r-- | src/extension/internal/emf-win32-inout.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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); |