Skip to content

C
core
Kaydet (Commit) 984dadaf authored tarafından Khaled Hosny's avatar Khaled Hosny
Dosyalara gözat
Seçenekler

Some notes 

Change-Id: I665826017f03b123a8b80d6cf31e37d18e169d10
üst fd786139
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
vcl/coretext/ctfonts.cxx
Dosyayı görüntüle @ 984dadaf
...@@ -138,7 +138,8 @@ void CTTextStyle::GetFontMetric( float fPixelSize, ImplFontMetricData& rMetric ) ...@@ -138,7 +138,8 @@ void CTTextStyle::GetFontMetric( float fPixelSize, ImplFontMetricData& rMetric )
bool CTTextStyle::GetGlyphBoundRect( sal_GlyphId nGlyphId, Rectangle& rRect ) const bool CTTextStyle::GetGlyphBoundRect( sal_GlyphId nGlyphId, Rectangle& rRect ) const
{ {
CGGlyph nCGGlyph = nGlyphId & GF_IDXMASK; // NOTE: CoreText handles glyph fallback itself CGGlyph nCGGlyph = nGlyphId & GF_IDXMASK;
// XXX: this is broken if the glyph came from fallback font
CTFontRef aCTFontRef = (CTFontRef)CFDictionaryGetValue( mpStyleDict, kCTFontAttributeName ); CTFontRef aCTFontRef = (CTFontRef)CFDictionaryGetValue( mpStyleDict, kCTFontAttributeName );
const CTFontOrientation aFontOrientation = kCTFontDefaultOrientation; // TODO: horz/vert const CTFontOrientation aFontOrientation = kCTFontDefaultOrientation; // TODO: horz/vert
...@@ -197,8 +198,8 @@ bool CTTextStyle::GetGlyphOutline( sal_GlyphId nGlyphId, basegfx::B2DPolyPolygon ...@@ -197,8 +198,8 @@ bool CTTextStyle::GetGlyphOutline( sal_GlyphId nGlyphId, basegfx::B2DPolyPolygon
{ {
rResult.clear(); rResult.clear();
// TODO: GF_FONTMASK if using non-native glyph fallback
CGGlyph nCGGlyph = nGlyphId & GF_IDXMASK; CGGlyph nCGGlyph = nGlyphId & GF_IDXMASK;
// XXX: this is broken if the glyph came from fallback font
CTFontRef pCTFont = (CTFontRef)CFDictionaryGetValue( mpStyleDict, kCTFontAttributeName ); CTFontRef pCTFont = (CTFontRef)CFDictionaryGetValue( mpStyleDict, kCTFontAttributeName );
CGPathRef xPath = CTFontCreatePathForGlyph( pCTFont, nCGGlyph, NULL ); CGPathRef xPath = CTFontCreatePathForGlyph( pCTFont, nCGGlyph, NULL );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment