summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2017-02-22 23:56:19 +0200
committerCaolán McNamara <caolanm@redhat.com>2017-02-23 12:27:11 +0000
commit659a38ba7678c7a62ba0872f390c59329daadb90 (patch)
tree072295e5a87896aba05cc76b4322dacae17fab1d
parent0a0b98ae530c7f27c2f790a889f3edbfc98858bd (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>
-rw-r--r--vcl/quartz/ctfonts.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index d962855d6c24..dd64b7a0c5a8 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;
}