mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i124922# allow late setting of the font color...

Browse Source 
for CoreText-layouted text

(cherry picked from commit 42f9768f771457c53a9f1e6a3581b2df9856401f)

Conflicts:
	vcl/aqua/source/gdi/ctfonts.cxx
	vcl/aqua/source/gdi/ctfonts.hxx
	vcl/aqua/source/gdi/ctlayout.cxx
	vcl/source/gdi/outdev3.cxx

Change-Id: Ie2685ab80ca87ea72e25f18d02f883fb36c24a36
This commit is contained in:
Herbert Dürr 2014-05-19 12:05:27 +00:00 committed by Caolán McNamara
parent 6828498283
commit 507efabe8b
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/inc/quartz/salgdi.h
View File

@ -106,7 +106,7 @@ public:
bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const; bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const;
bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const; bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const;
void SetTextColor( const RGBAColor& ); void SetTextColor( const RGBAColor& ) {}
const CoreTextFontData* mpFontData; const CoreTextFontData* mpFontData;
/// <1.0: font is squeezed, >1.0 font is stretched, else 1.0 /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0

14
vcl/quartz/ctfonts.cxx
View File

@ -100,6 +100,10 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
CFDictionarySetValue( mpStyleDict, kCTFontAttributeName, pNewCTFont ); CFDictionarySetValue( mpStyleDict, kCTFontAttributeName, pNewCTFont );
CFRelease( pNewCTFont); CFRelease( pNewCTFont);
// allow delayed setting the font color, i.e. after the text layout
CFDictionarySetValue( mpStyleDict, kCTForegroundColorFromContextAttributeName, kCFBooleanTrue );
#if 0 // LastResort is implicit in CoreText's font cascading #if 0 // LastResort is implicit in CoreText's font cascading
const void* aGFBDescriptors[] = { CTFontDescriptorCreateWithNameAndSize( CFSTR("LastResort"), 0) }; // TODO: use the full GFB list const void* aGFBDescriptors[] = { CTFontDescriptorCreateWithNameAndSize( CFSTR("LastResort"), 0) }; // TODO: use the full GFB list
const int nGfbCount = sizeof(aGFBDescriptors) / sizeof(*aGFBDescriptors); const int nGfbCount = sizeof(aGFBDescriptors) / sizeof(*aGFBDescriptors);
@ -218,16 +222,6 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg
return true; return true;
} }
void CoreTextStyle::SetTextColor( const RGBAColor& rColor )
{
CGFloat aColor[] = { rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() };
CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
CGColorRef pCGColor = CGColorCreate( cs, aColor );
CGColorSpaceRelease( cs );
CFDictionarySetValue( mpStyleDict, kCTForegroundColorAttributeName, pCGColor );
CFRelease( pCGColor);
}
PhysicalFontFace* CoreTextFontData::Clone( void ) const PhysicalFontFace* CoreTextFontData::Clone( void ) const
{ {
return new CoreTextFontData( *this); return new CoreTextFontData( *this);

9
vcl/quartz/ctlayout.cxx
View File

@ -108,6 +108,7 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
m_vRunData.release(); m_vRunData.release();
bLayouted = false; bLayouted = false;
// release an eventual older layout
if( mpAttrString ) if( mpAttrString )
CFRelease( mpAttrString ); CFRelease( mpAttrString );
mpAttrString = NULL; mpAttrString = NULL;
@ -115,6 +116,7 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
CFRelease( mpCTLine ); CFRelease( mpCTLine );
mpCTLine = NULL; mpCTLine = NULL;
// initialize the new layout
SalLayout::AdjustLayout( rArgs ); SalLayout::AdjustLayout( rArgs );
mnCharCount = mnEndCharPos - mnMinCharPos; mnCharCount = mnEndCharPos - mnMinCharPos;
@ -338,7 +340,7 @@ void CTLayout::drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, cons
CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 ); CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 );
CGContextSetShouldAntialias( rAquaGraphics.mrContext, !rAquaGraphics.mbNonAntialiasedText ); CGContextSetShouldAntialias( rAquaGraphics.mrContext, !rAquaGraphics.mbNonAntialiasedText );
// Draw the text // set the text transformation (e.g. position)
CGPoint aTextPos = GetTextDrawPosition(); CGPoint aTextPos = GetTextDrawPosition();
if( pStyle->mfFontRotation != 0.0 ) if( pStyle->mfFontRotation != 0.0 )
@ -353,7 +355,12 @@ void CTLayout::drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, cons
SAL_INFO( "vcl.ct", "CGContextSetTextPosition(" << rAquaGraphics.mrContext << "," << aTextPos << ")" ); SAL_INFO( "vcl.ct", "CGContextSetTextPosition(" << rAquaGraphics.mrContext << "," << aTextPos << ")" );
CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y ); CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y );
// set the text color as fill color (see kCTForegroundColorFromContextAttributeName)
CGContextSetFillColor( rAquaGraphics.mrContext, rAquaGraphics.maTextColor.AsArray() );
SAL_INFO( "vcl.ct", "CTLineDraw(" << ctline << "," << rAquaGraphics.mrContext << ")" ); SAL_INFO( "vcl.ct", "CTLineDraw(" << ctline << "," << rAquaGraphics.mrContext << ")" );
// draw the text
CTLineDraw( ctline, rAquaGraphics.mrContext ); CTLineDraw( ctline, rAquaGraphics.mrContext );
#ifndef IOS #ifndef IOS
// request an update of the changed window area // request an update of the changed window area

8
vcl/source/outdev/text.cxx
View File

@ -1282,14 +1282,6 @@ SalLayout* OutputDevice::ImplLayout(const OUString& rOrigStr,
ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs( aStr, nMinIndex, nLen, nPixelWidth, pDXArray ); ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs( aStr, nMinIndex, nLen, nPixelWidth, pDXArray );
#if defined(MACOSX) || defined(IOS)
// CoreText layouts are immutable and already contain the text color
// so we need to provide the color already for the layout request
// even if this layout will never be drawn
if( mbInitTextColor )
const_cast<OutputDevice&>(*this).ImplInitTextColor();
#endif
// get matching layout object for base font // get matching layout object for base font
SalLayout* pSalLayout = mpGraphics->GetTextLayout( aLayoutArgs, 0 ); SalLayout* pSalLayout = mpGraphics->GetTextLayout( aLayoutArgs, 0 );