Updated to version 1.1.7

tobihagemann · Dec 18, 2013 · 8964e83 · 8964e83
1 parent b1a719c
commit 8964e83
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 THLabel
 
-Version 1.1.6, November 21st, 2013
+Version 1.1.7, December 18th, 2013
 
 Copyright (c) 2013 Tobias Hagemann, tobiha.de
 

diff --git a/RELEASE NOTES.md b/RELEASE NOTES.md
@@ -1,3 +1,7 @@
+Version 1.1.7
+
+- Fixed drawing, when frame is too small.
+
 Version 1.1.6
 
 - Fixed memory related crash.

diff --git a/THLabel.podspec b/THLabel.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'THLabel'
-  s.version      = '1.1.6'
+  s.version      = '1.1.7'
   s.summary      = 'THLabel is a subclass of UILabel, which additionally allows shadow blur, stroke text and fill gradient.'
   s.homepage     = 'https://github.com/MuscleRumble/THLabel'
   s.screenshots  = 'https://github.com/MuscleRumble/THLabel/blob/master/screenshot.png'

diff --git a/THLabel/THLabel.h b/THLabel/THLabel.h
@@ -1,7 +1,7 @@
 //
 //  THLabel.h
 //
-//  Version 1.1.6
+//  Version 1.1.7
 //
 //  Created by Tobias Hagemann on 11/25/12.
 //  Copyright (c) 2013 tobiha.de. All rights reserved.

diff --git a/THLabel/THLabel.m b/THLabel/THLabel.m
@@ -1,7 +1,7 @@
 //
 //  THLabel.m
 //
-//  Version 1.1.6
+//  Version 1.1.7
 //
 //  Created by Tobias Hagemann on 11/25/12.
 //  Copyright (c) 2013 tobiha.de. All rights reserved.
@@ -383,8 +383,11 @@ - (CGRect)contentRectFromBounds:(CGRect)bounds withInsets:(UIEdgeInsets)insets {
 }
 
 - (CGRect)textRectFromContentRect:(CGRect)contentRect framesetterRef:(CTFramesetterRef)framesetterRef {
-	CGRect textRect = contentRect;
-	textRect.size = CTFramesetterSuggestFrameSizeWithConstraints(framesetterRef, CFRangeMake(0, [self.text length]), NULL, contentRect.size, NULL);
+	CGSize suggestedTextRectSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetterRef, CFRangeMake(0, [self.text length]), NULL, contentRect.size, NULL);
+	if (CGSizeEqualToSize(suggestedTextRectSize, CGSizeZero)) {
+		suggestedTextRectSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetterRef, CFRangeMake(0, [self.text length]), NULL, CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX), NULL);
+	}
+	CGRect textRect = CGRectMake(0.0, 0.0, suggestedTextRectSize.width, suggestedTextRectSize.height);
 
 	// Horizontal alignment.
 	switch (self.textAlignment) {