Updated to version 1.5.1

nicklockwood · Aug 3, 2013 · 1413d43 · 1413d43
1 parent 6adb137
commit 1413d43
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/FXLabel.podspec b/FXLabel.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name         =  'FXLabel'
-  s.version      =  '1.5'
+  s.version      =  '1.5.1'
   s.license      =  'zlib'
   s.summary      =  'UILabel subclass that supports soft shadows, inner shadow and gradient fill, and which can easily be used in place of any standard UILabel.'
   s.description  =  'FXLabel improves upon the standard UILabel by providing a subclass that supports soft shadows, inner shadow and gradient fill, and which can easily be used in place of any standard UILabel.'
   s.homepage     =  'http://charcoaldesign.co.uk/source/cocoa#fxlabel'
   s.author       =  { 'Nick Lockwood' => 'http://charcoaldesign.co.uk/' }
-  s.source       =  { :git => 'https://github.com/nicklockwood/FXLabel.git', :tag => '1.5' }
+  s.source       =  { :git => 'https://github.com/nicklockwood/FXLabel.git', :tag => '1.5.1' }
   s.platform     =  :ios
   s.source_files =  'FXLabel'
   s.requires_arc =  true

diff --git a/FXLabel/FXLabel.h b/FXLabel/FXLabel.h
@@ -1,7 +1,7 @@
 //
 //  FXLabel.h
 //
-//  Version 1.5
+//  Version 1.5.1
 //
 //  Created by Nick Lockwood on 20/08/2011.
 //  Copyright 2011 Charcoal Design

diff --git a/FXLabel/FXLabel.m b/FXLabel/FXLabel.m
@@ -1,7 +1,7 @@
 //
 //  FXLabel.m
 //
-//  Version 1.5
+//  Version 1.5.1
 //
 //  Created by Nick Lockwood on 20/08/2011.
 //  Copyright 2011 Charcoal Design
@@ -165,7 +165,7 @@ - (NSArray *)FXLabel_linesWithFont:(UIFont *)font
         while (index < [words count])
         {
             NSInteger lineCount = [lines count];
-            if (lineCount && ((lineCount + 1) * font.lineHeight + lineCount * font.pointSize * lineSpacing) > size.height)
+            if (lineCount && ((lineCount + 1) * font.lineHeight + lineCount * roundf(font.pointSize * lineSpacing)) > size.height)
             {
                 //append remaining text to last line
                 NSArray *remainingWords = [words subarrayWithRange:NSMakeRange(index, [words count] - index)];

diff --git a/LICENCE.md b/LICENCE.md
@@ -1,6 +1,6 @@
 FXLabel
 
-Version 1.5, May 23rd, 2013
+Version 1.5.1, August 3rd, 2013
 
 Copyright (C) 2011 Charcoal Design
 

diff --git a/RELEASE NOTES.md b/RELEASE NOTES.md
@@ -1,3 +1,7 @@
+Version 1.5.1
+
+- Fixed rounding error that caused layout for multiline labels to not work correctly
+
 Version 1.5
 
 - Added innerShadowBlur property