Merge pull request #3 from Remki/fixingAwakeFromNib

Remki · Remki · commit 206b0abc49bd · 2015-04-23T15:37:44.000+02:00
Fixed default font descriptor.
diff --git a/SSDynamicText/SSDynamicLabel.m b/SSDynamicText/SSDynamicLabel.m
@@ -46,8 +46,8 @@ - (void)awakeFromNib {
     self.fontName = (self.fontName ?: [self ss_defaultFontName]);
     self.baseSize = (self.baseSize ?: [self ss_defaultBaseSize]);
     
-    self.defaultFontDescriptor = [UIFontDescriptor fontDescriptorWithName:self.fontName
-                                                                     size:self.baseSize];
+    self.defaultFontDescriptor = (self.font.fontDescriptor ?: [UIFontDescriptor fontDescriptorWithName:self.fontName
+                                                                                                  size:self.baseSize]);
     [self setup];
 }
 
diff --git a/SSDynamicText/SSDynamicTextField.m b/SSDynamicText/SSDynamicTextField.m
@@ -46,8 +46,8 @@ - (void)awakeFromNib {
     self.fontName = (self.fontName ?: [self ss_defaultFontName]);
     self.baseSize = (self.baseSize ?: [self ss_defaultBaseSize]);
     
-    self.defaultFontDescriptor = [UIFontDescriptor fontDescriptorWithName:self.fontName
-                                                                     size:self.baseSize];
+    self.defaultFontDescriptor = (self.font.fontDescriptor ?: [UIFontDescriptor fontDescriptorWithName:self.fontName
+                                                                                                  size:self.baseSize]);
     [self setup];
 }
 
diff --git a/SSDynamicText/SSDynamicTextView.m b/SSDynamicText/SSDynamicTextView.m
@@ -46,8 +46,8 @@ - (void)awakeFromNib {
     self.fontName = (self.fontName ?: [self ss_defaultFontName]);
     self.baseSize = (self.baseSize ?: [self ss_defaultBaseSize]);
     
-    self.defaultFontDescriptor = [UIFontDescriptor fontDescriptorWithName:self.fontName
-                                                                     size:self.baseSize];
+    self.defaultFontDescriptor = (self.font.fontDescriptor ?: [UIFontDescriptor fontDescriptorWithName:self.fontName
+                                                                                                  size:self.baseSize]);
     [self setup];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ - (void)awakeFromNib {`
`46`	`46`	`self.fontName = (self.fontName ?: [self ss_defaultFontName]);`
`47`	`47`	`self.baseSize = (self.baseSize ?: [self ss_defaultBaseSize]);`
`48`	`48`
`49`		`- self.defaultFontDescriptor = [UIFontDescriptor fontDescriptorWithName:self.fontName`
`50`		`- size:self.baseSize];`
	`49`	`+ self.defaultFontDescriptor = (self.font.fontDescriptor ?: [UIFontDescriptor fontDescriptorWithName:self.fontName`
	`50`	`+ size:self.baseSize]);`
`51`	`51`	`[self setup];`
`52`	`52`	`}`
`53`	`53`