Modify to return nil if empty text is passed

ikait · May 31, 2016 · d5e7d9d · d5e7d9d
1 parent 99278f8
commit d5e7d9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/KernLabel/KernLabel/KernLabel.swift b/KernLabel/KernLabel/KernLabel.swift
@@ -283,7 +283,7 @@ public class KernLabel: UIView {
             truncateText: self.truncateText,
             kerningRegexp: self.kerningMode.regexp)
         type.createDrawedImage()
-        return CGRect(origin: CGPointZero, size: type.intrinsicTextSize!)
+        return CGRect(origin: CGPointZero, size: type.intrinsicTextSize)
     }
 
     /**

diff --git a/KernLabel/KernLabel/Type.swift b/KernLabel/KernLabel/Type.swift
@@ -74,7 +74,7 @@ struct Type {
     var typesetter: CTTypesetter
 
     /// 実際のテキストサイズ
-    var intrinsicTextSize: CGSize?
+    var intrinsicTextSize = CGSizeZero
 
     // フォントの半分の大きさ
     var fontHalfWidth: CGFloat {
@@ -305,7 +305,7 @@ struct Type {
                 canvasContext,
                 CGRectMake(
                     0,  // ↓ Int で切り捨ててピクセルまたぎでボヤけないようにする
-                    CGFloat(Int((self.height - self.intrinsicTextSize!.height) / 2)),
+                    CGFloat(Int((self.height - self.intrinsicTextSize.height) / 2)),
                     self.width,
                     self.height),
                 CGBitmapContextCreateImage(context)
@@ -320,6 +320,10 @@ struct Type {
      */
     private mutating func process(canvasContext: CGContext? = nil) -> CGContext? {
 
+        if self.attributedText.string.isEmpty {
+            return nil
+        }
+
         let context = self.createEmptyContext()
 
         while self.location < self.length {