Merge pull request #50 from pierrephi/master

Fix for cells w/o accessory view [iOS7]
tmdvs · Mar 12, 2014 · ac9b231 · ac9b231
2 parents a9070e2 + ffcc6f8
commit ac9b231
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/TDBadgedCell (xcode project)/TDBadgedCell.m b/TDBadgedCell (xcode project)/TDBadgedCell.m
@@ -217,14 +217,8 @@ - (void)configureSelf
 	self.badge.parent = self;
 
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
-    self.badgeLeftOffset = 10.f;
-    self.badgeRightOffset = 0;
-#else
     self.badgeLeftOffset = 10.f;
     self.badgeRightOffset = 12.f;
-#endif
-
 
     // by default, resize textLabel & detailTextLabel
     self.resizeableLabels = [NSMutableArray arrayWithCapacity:2];
@@ -266,7 +260,15 @@ - (void) layoutSubviews
 		else
 			[self.badge setHidden:NO];
 
-
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+        if (self.accessoryType != UITableViewCellAccessoryNone) {
+
+            self.badgeRightOffset = 0.f;
+        } else {
+
+            self.badgeRightOffset = 12.f;
+        }
+#endif
         // Calculate the size of the bage from the badge string
         UIFont *font = self.badge.boldFont ? [UIFont boldSystemFontOfSize:self.badge.fontSize] : [UIFont systemFontOfSize:self.badge.fontSize];
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000