lineSpacing treatment upgrade

kCTParagraphStyleSpecifierLineSpacing Deprecated. Use kCTParagraphStyleSpecifierMaximumLineSpacing, kCTParagraphStyleSpecifierMinimumLineSpacing, and kCTParagraphStyleSpecifierLineSpaceAdjustment to control space between lines. https://developer.apple.com/library/mac/documentation/Carbon/reference/C TParagraphStyleRef/Reference/reference.html#jumpTo_35
hsoi · Mar 11, 2014 · 5885159 · 5885159
1 parent ec1a489
commit 5885159
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/OHAttributedLabel/Source/OHParagraphStyle.m b/OHAttributedLabel/Source/OHParagraphStyle.m
@@ -45,7 +45,8 @@ - (id)initWithCTParagraphStyle:(CTParagraphStyleRef)style
     if (self)
     {
         CTParagraphStyleRef paragraphStyle = style ?: CTParagraphStyleCreate(NULL, 0);
-        CTParagraphStyleGetValueForSpecifier(paragraphStyle, kCTParagraphStyleSpecifierLineSpacing,sizeof(_lineSpacing), &_lineSpacing);
+        CTParagraphStyleGetValueForSpecifier(paragraphStyle, kCTParagraphStyleSpecifierMinimumLineSpacing,sizeof(_lineSpacing), &_lineSpacing);
+        CTParagraphStyleGetValueForSpecifier(paragraphStyle, kCTParagraphStyleSpecifierMaximumLineSpacing,sizeof(_lineSpacing), &_lineSpacing);
         CTParagraphStyleGetValueForSpecifier(paragraphStyle, kCTParagraphStyleSpecifierParagraphSpacing, sizeof(_paragraphSpacing), &_paragraphSpacing);
         CTParagraphStyleGetValueForSpecifier(paragraphStyle, kCTParagraphStyleSpecifierAlignment,sizeof(_textAlignment), &_textAlignment);
         CTParagraphStyleGetValueForSpecifier(paragraphStyle, kCTParagraphStyleSpecifierLineBreakMode, sizeof(_lineBreakMode), &_lineBreakMode);
@@ -66,10 +67,11 @@ - (id)initWithCTParagraphStyle:(CTParagraphStyleRef)style
 
 - (CTParagraphStyleRef)createCTParagraphStyle
 {
-    const int kSettingsCount = 12;
+    const int kSettingsCount = 13;
     CTParagraphStyleSetting settings[kSettingsCount] =
     {
-        { kCTParagraphStyleSpecifierLineSpacing, sizeof(_lineSpacing), &_lineSpacing },
+        { kCTParagraphStyleSpecifierMinimumLineSpacing, sizeof(_lineSpacing), &_lineSpacing },
+        { kCTParagraphStyleSpecifierMaximumLineSpacing, sizeof(_lineSpacing), &_lineSpacing },
         { kCTParagraphStyleSpecifierParagraphSpacing, sizeof(_paragraphSpacing), &_paragraphSpacing },
         { kCTParagraphStyleSpecifierAlignment, sizeof(_textAlignment), &_textAlignment },
         { kCTParagraphStyleSpecifierLineBreakMode, sizeof(_lineBreakMode), &_lineBreakMode },