Kaydet (Commit) 3e99ab21 authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

Resolves: #i124121# prevent italic emulation with ITALIC_DONTKNOW fonts

(cherry picked from commit a8cd1fab)

Conflicts:
	vcl/aqua/source/gdi/ctfonts.cxx

Change-Id: Ib2893a0ce119ac56ac7091fd18a652fe990e82ec
üst f244845c
...@@ -74,7 +74,9 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) ...@@ -74,7 +74,9 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
CFDictionarySetValue( mpStyleDict, kCTVerticalFormsAttributeName, pCFVertBool ); CFDictionarySetValue( mpStyleDict, kCTVerticalFormsAttributeName, pCFVertBool );
// fake bold // fake bold
if ((pReqFont->GetWeight() >= WEIGHT_BOLD) && (mpFontData->GetWeight() < WEIGHT_SEMIBOLD)) if ( (pReqFont->GetWeight() >= WEIGHT_BOLD) &&
((mpFontData->GetWeight() < WEIGHT_SEMIBOLD) &&
(mpFontData->GetWeight() != WEIGHT_DONTKNOW)) )
{ {
int nStroke = -10.0; int nStroke = -10.0;
CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke); CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke);
...@@ -83,7 +85,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) ...@@ -83,7 +85,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
// fake italic // fake italic
if (((pReqFont->GetSlant() == ITALIC_NORMAL) || (pReqFont->GetSlant() == ITALIC_OBLIQUE)) if (((pReqFont->GetSlant() == ITALIC_NORMAL) || (pReqFont->GetSlant() == ITALIC_OBLIQUE))
&& !((mpFontData->GetSlant() == ITALIC_NORMAL) || (mpFontData->GetSlant() == ITALIC_OBLIQUE))) && (mpFontData->GetSlant() == ITALIC_NONE))
{ {
aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, toRadian(120), 1, 0, 0)); aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, toRadian(120), 1, 0, 0));
} }
......
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