Use the -boundingRectWithSize:options:attributes:context: method for all string measurement. Fixed issue core-plot#280.

Author: eskroch

framework/MacOnly/CPTPlatformSpecificCategories.h

@@ -39,4 +39,9 @@
 -(void)drawInRect:(CGRect)rect inContext:(nonnull CGContextRef)context;
 /// @}
 
+/// @name Measurement
+/// @{
+-(CGSize)sizeAsDrawn;
+/// @}
+
 @end

framework/MacOnly/CPTPlatformSpecificCategories.m

@@ -100,4 +100,29 @@ -(void)drawInRect:(CGRect)rect inContext:(nonnull CGContextRef)context
     CPTPopCGContext();
 }
 
+/**
+ *  @brief Computes the size of the styled text when drawn rounded up to the nearest whole number in each dimension.
+ **/
+-(CGSize)sizeAsDrawn
+{
+    CGRect rect = CGRectZero;
+
+    if ( [self respondsToSelector:@selector(boundingRectWithSize:options:context:)] ) {
+        rect = [self boundingRectWithSize:CPTSizeMake(10000.0, 10000.0)
+                                  options:CPTStringDrawingOptions
+                                  context:nil];
+    }
+    else {
+        rect = [self boundingRectWithSize:CPTSizeMake(10000.0, 10000.0)
+                                  options:CPTStringDrawingOptions];
+    }
+
+    CGSize textSize = rect.size;
+
+    textSize.width  = ceil(textSize.width);
+    textSize.height = ceil(textSize.height);
+
+    return textSize;
+}
+
 @end

framework/MacOnly/CPTTextStylePlatformSpecific.m

@@ -198,25 +198,15 @@ @implementation NSString(CPTTextStyleExtensions)
  **/
 -(CGSize)sizeWithTextStyle:(nullable CPTTextStyle *)style
 {
-    NSFont *theFont    = nil;
-    NSString *fontName = style.fontName;
-
-    if ( fontName ) {
-        theFont = [NSFont fontWithName:fontName size:style.fontSize];
-    }
+    CGRect rect = [self boundingRectWithSize:CPTSizeMake(10000.0, 10000.0)
+                                     options:CPTStringDrawingOptions
+                                  attributes:style.attributes
+                                     context:nil];
 
-    CGSize textSize;
+    CGSize textSize = rect.size;
 
-    if ( theFont ) {
-        CPTDictionary *attributes = @{
-            NSFontAttributeName: theFont
-        };
-
-        textSize = NSSizeToCGSize([self sizeWithAttributes:attributes]);
-    }
-    else {
-        textSize = CGSizeZero;
-    }
+    textSize.width  = ceil(textSize.width);
+    textSize.height = ceil(textSize.height);
 
     return textSize;
 }

framework/Source/CPTLegendEntry.m

@@ -219,12 +219,8 @@ -(CGSize)titleSize
 
     NSAttributedString *styledTitle = self.attributedTitle;
 
-    if ( (styledTitle.length > 0) && [styledTitle respondsToSelector:@selector(size)] ) {
-#if TARGET_OS_SIMULATOR || TARGET_OS_IPHONE
-        theTitleSize = styledTitle.size;
-#else
-        theTitleSize = NSSizeToCGSize(styledTitle.size);
-#endif
+    if ( styledTitle.length > 0 ) {
+        theTitleSize = [styledTitle sizeAsDrawn];
     }
     else {
         NSString *theTitle = styledTitle.string;

framework/Source/CPTTextLayer.m

@@ -316,12 +316,8 @@ -(CGSize)sizeThatFits
 
     if ( myText.length > 0 ) {
         NSAttributedString *styledText = self.attributedText;
-        if ( (styledText.length > 0) && [styledText respondsToSelector:@selector(size)] ) {
-#if TARGET_OS_SIMULATOR || TARGET_OS_IPHONE
-            textSize = styledText.size;
-#else
-            textSize = NSSizeToCGSize(styledText.size);
-#endif
+        if ( styledText.length > 0 ) {
+            textSize = [styledText sizeAsDrawn];
         }
         else {
             textSize = [myText sizeWithTextStyle:self.textStyle];

framework/iPhoneOnly/CPTPlatformSpecificCategories.h

@@ -53,4 +53,9 @@
 -(void)drawInRect:(CGRect)rect inContext:(nonnull CGContextRef)context;
 /// @}
 
+/// @name Measurement
+/// @{
+-(CGSize)sizeAsDrawn;
+/// @}
+
 @end

framework/iPhoneOnly/CPTPlatformSpecificCategories.m

@@ -114,4 +114,21 @@ -(void)drawInRect:(CGRect)rect inContext:(nonnull CGContextRef)context
     }
 }
 
+/**
+ *  @brief Computes the size of the styled text when drawn rounded up to the nearest whole number in each dimension.
+ **/
+-(CGSize)sizeAsDrawn
+{
+    CGRect rect = [self boundingRectWithSize:CPTSizeMake(10000.0, 10000.0)
+                                     options:CPTStringDrawingOptions
+                                     context:nil];
+
+    CGSize textSize = rect.size;
+
+    textSize.width  = ceil(textSize.width);
+    textSize.height = ceil(textSize.height);
+
+    return textSize;
+}
+
 @end

framework/iPhoneOnly/CPTTextStylePlatformSpecific.h

@@ -10,18 +10,3 @@ typedef NS_ENUM (NSInteger, CPTTextAlignment) {
     CPTTextAlignmentJustified = NSTextAlignmentJustified, ///< Justified alignment.
     CPTTextAlignmentNatural   = NSTextAlignmentNatural    ///< Natural alignment of the text's script.
 };
-
-// @cond
-// for iOS SDK compatibility
-#if TARGET_OS_SIMULATOR || TARGET_OS_IPHONE
-#if __IPHONE_OS_VERSION_MAX_ALLOWED<70000
-@interface NSString(CPTTextStylePlatformSpecificExtensions)
-
--(CGSize)sizeWithAttributes:(nonnull CPTDictionary *)attrs;
-
-@end
-#else
-#endif
-#endif
-
-/// @endcond

framework/iPhoneOnly/CPTTextStylePlatformSpecific.m

@@ -169,41 +169,15 @@ @implementation NSString(CPTTextStyleExtensions)
  **/
 -(CGSize)sizeWithTextStyle:(nullable CPTTextStyle *)style
 {
-    CGSize textSize;
-
-#if TARGET_OS_SIMULATOR || TARGET_OS_TV
     CGRect rect = [self boundingRectWithSize:CPTSizeMake(10000.0, 10000.0)
                                      options:CPTStringDrawingOptions
                                   attributes:style.attributes
                                      context:nil];
-    textSize        = rect.size;
-    textSize.width  = ceil(textSize.width);
-    textSize.height = ceil(textSize.height);
-#else
-    // -boundingRectWithSize:options:attributes:context: is available in iOS 7.0 and later
-    if ( [self respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)] ) {
-        CGRect rect = [self boundingRectWithSize:CPTSizeMake(10000.0, 10000.0)
-                                         options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine
-                                      attributes:style.attributes
-                                         context:nil];
-        textSize        = rect.size;
-        textSize.width  = ceil(textSize.width);
-        textSize.height = ceil(textSize.height);
-    }
-    else {
-        UIFont *theFont    = nil;
-        NSString *fontName = style.fontName;
 
-        if ( fontName ) {
-            theFont = [UIFont fontWithName:fontName size:style.fontSize];
-        }
+    CGSize textSize = rect.size;
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        textSize = [self sizeWithFont:theFont constrainedToSize:CPTSizeMake(10000.0, 10000.0)];
-#pragma clang diagnostic pop
-    }
-#endif
+    textSize.width  = ceil(textSize.width);
+    textSize.height = ceil(textSize.height);
 
     return textSize;
 }