diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-01-11 19:51:54 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2022-01-12 15:08:36 +0100 |
commit | be30c734bf420f9dd890906c84d2b4460385a2ba (patch) | |
tree | 5b6219b8f666e0493ad5961bdca7b132f63b3d85 /vcl/win/gdi/DWriteTextRenderer.cxx | |
parent | 9a850dd9f3c221660b6259bdfd64a77343f2256c (diff) |
keep positions as DeviceCoordinate within SalLayout
Change-Id: I20bbb0e252ffd09901f587599430e715dbe977b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128300
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win/gdi/DWriteTextRenderer.cxx')
-rw-r--r-- | vcl/win/gdi/DWriteTextRenderer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx index 2f089ee3d2d4..fbed3d28eddf 100644 --- a/vcl/win/gdi/DWriteTextRenderer.cxx +++ b/vcl/win/gdi/DWriteTextRenderer.cxx @@ -252,15 +252,15 @@ bool D2DWriteTextOutRenderer::performRender(GenericSalLayout const & rLayout, Sa mpRT->BeginDraw(); int nStart = 0; - Point aPos(0, 0); + DevicePoint aPos; const GlyphItem* pGlyph; while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { UINT16 glyphIndices[] = { pGlyph->glyphId() }; FLOAT glyphAdvances[] = { static_cast<FLOAT>(pGlyph->m_nNewWidth) / fHScale }; DWRITE_GLYPH_OFFSET glyphOffsets[] = { { 0.0f, 0.0f }, }; - D2D1_POINT_2F baseline = { static_cast<FLOAT>(aPos.X() - bounds.Left()) / fHScale, - static_cast<FLOAT>(aPos.Y() - bounds.Top()) }; + D2D1_POINT_2F baseline = { static_cast<FLOAT>(aPos.getX() - bounds.Left()) / fHScale, + static_cast<FLOAT>(aPos.getY() - bounds.Top()) }; WinFontTransformGuard aTransformGuard(mpRT, fHScale, rLayout, baseline, pGlyph->IsVertical()); DWRITE_GLYPH_RUN glyphs = { mpFontFace, |