diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2017-02-22 23:56:19 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-03-02 10:24:02 +0000 |
commit | 7dc1f5da3581c048d977cb18699fd44ea1c4d465 (patch) | |
tree | 17bb4e0761327874a549e73162fa37fe81c9a19f | |
parent | c9a62f514a5e70b3cafed68df2a43ed6cd4680d3 (diff) |
tdf#104509: Fix GetGlyphBoundRect on Mac
The rectangle top and bottom were mixed up! I tried to fix this in
8cef9b4dbafdebc0566d6d7f715f27f978ddfe5b, but it was not the right fix.
Change-Id: Ia033ff2823bfd641e830d748d413d7791bfee5b8
Reviewed-on: https://gerrit.libreoffice.org/34557
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 04d086531ff4a3ab24b704489270c7c23792bd20)
Reviewed-on: https://gerrit.libreoffice.org/34559
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 659a38ba7678c7a62ba0872f390c59329daadb90)
Reviewed-on: https://gerrit.libreoffice.org/34579
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | vcl/quartz/ctfonts.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 20f5414b2508..fca177ea98bf 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -184,9 +184,9 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) aCGRect = CGRectApplyAffineTransform(aCGRect, CGAffineTransformMakeRotation(mfFontRotation)); rRect.Left() = lrint( aCGRect.origin.x ); - rRect.Top() = lrint(-aCGRect.origin.y ); + rRect.Top() = lrint(-aCGRect.origin.y - aCGRect.size.height ); rRect.Right() = lrint( aCGRect.origin.x + aCGRect.size.width ); - rRect.Bottom() = lrint( aCGRect.origin.y - aCGRect.size.height ); + rRect.Bottom() = lrint(-aCGRect.origin.y ); return true; } |