mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

Fixed some CoreText problems.

Browse source
This commit is contained in:
jules 2012-02-25 22:32:05 +00:00
parent 40e473d4dc
commit c8d3144fa2
1 changed files with 17 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

69
modules/juce_graphics/native/juce_mac_Fonts.mm
View file

@ -33,7 +33,8 @@
namespace CoreTextTypeLayout
{
CTFontRef createCTFont (const Font& font, float fontSize, bool& needsItalicTransform)
CTFontRef createCTFont (const Font& font, const float fontSize,
const bool applyScaleFactor, bool& needsItalicTransform)
{
CFStringRef cfName = font.getTypefaceName().toCFString();
CTFontRef ctFontRef = CTFontCreateWithName (cfName, fontSize, nullptr);
@ -67,29 +68,23 @@ namespace CoreTextTypeLayout
ctFontRef = newFont;
}
}
if (applyScaleFactor)
{
CGFontRef cgFontRef = CTFontCopyGraphicsFont (ctFontRef, nullptr);
const int totalHeight = std::abs (CGFontGetAscent (cgFontRef)) + std::abs (CGFontGetDescent (cgFontRef));
const float factor = CGFontGetUnitsPerEm (cgFontRef) / (float) totalHeight;
CGFontRelease (cgFontRef);
CTFontRef newFont = CTFontCreateCopyWithAttributes (ctFontRef, fontSize * factor, nullptr, nullptr);
CFRelease (ctFontRef);
ctFontRef = newFont;
}
}
return ctFontRef;
}
float getFontHeightToCGSizeFactor (const Font& font)
{
static float factor = 0;
if (factor == 0) // (This factor seems to be a constant for all fonts..)
{
bool needsItalicTransform = false;
CTFontRef tempFont = createCTFont (font, 1024, needsItalicTransform);
CGFontRef cgFontRef = CTFontCopyGraphicsFont (tempFont, nullptr);
const int totalHeight = std::abs (CGFontGetAscent (cgFontRef)) + std::abs (CGFontGetDescent (cgFontRef));
factor = CGFontGetUnitsPerEm (cgFontRef) / (float) totalHeight;
CGFontRelease (cgFontRef);
CFRelease (tempFont);
}
return factor;
}
//==============================================================================
struct Advances
{
@ -170,8 +165,7 @@ namespace CoreTextTypeLayout
{
const Font& f = *attr->getFont();
bool needsItalicTransform = false;
CTFontRef ctFontRef = createCTFont (f, f.getHeight() * getFontHeightToCGSizeFactor (f),
needsItalicTransform);
CTFontRef ctFontRef = createCTFont (f, f.getHeight(), true, needsItalicTransform);
CFAttributedStringSetAttribute (attribString, CFRangeMake (range.getStart(), range.getLength()),
kCTFontAttributeName, ctFontRef);
@ -244,19 +238,6 @@ namespace CoreTextTypeLayout
return attribString;
}
float getTextHeight (CTFrameRef frame, const CGRect& bounds)
{
CFArrayRef lines = CTFrameGetLines (frame);
CFIndex numLines = CFArrayGetCount (lines);
CFIndex lastLineIndex = numLines - 1;
CGFloat descent;
CTLineRef line = (CTLineRef) CFArrayGetValueAtIndex (lines, lastLineIndex);
CTLineGetTypographicBounds (line, nullptr, &descent, nullptr);
CGPoint lastLineOrigin;
CTFrameGetLineOrigins (frame, CFRangeMake (lastLineIndex, 1), &lastLineOrigin);
return bounds.size.height - lastLineOrigin.y + descent;
}
void drawToCGContext (const AttributedString& text, const Rectangle<float>& area,
const CGContextRef& context, const float flipHeight)
{
@ -269,27 +250,11 @@ namespace CoreTextTypeLayout
(CGFloat) area.getWidth(), (CGFloat) area.getHeight());
CGPathAddRect (path, nullptr, bounds);
CTFrameRef frame = CTFramesetterCreateFrame (framesetter, CFRangeMake (0, 0), path, NULL);
CTFrameRef frame = CTFramesetterCreateFrame (framesetter, CFRangeMake (0, 0), path, nullptr);
CFRelease (framesetter);
CGPathRelease (path);
float dy = 0;
if (text.getJustification().getOnlyVerticalFlags() == Justification::bottom)
dy = bounds.size.height - getTextHeight (frame, bounds);
else if (text.getJustification().getOnlyVerticalFlags() == Justification::verticallyCentred)
dy = (bounds.size.height - getTextHeight (frame, bounds)) / 2.0f;
if (dy != 0)
{
CGContextSaveGState (context);
CGContextTranslateCTM (context, 0, -dy);
}
CTFrameDraw (frame, context);
if (dy != 0)
CGContextRestoreGState (context);
CFRelease (frame);
}
@ -405,7 +370,7 @@ public:
unitsToHeightScaleFactor (0.0f)
{
bool needsItalicTransform = false;
ctFontRef = CoreTextTypeLayout::createCTFont (font, 1024.0f, needsItalicTransform);
ctFontRef = CoreTextTypeLayout::createCTFont (font, 1024.0f, false, needsItalicTransform);
if (ctFontRef != nullptr)
{