Fix clipped labels for Multi- and TitleValue elements

jollyblade · Mar 8, 2010 · f8ef35e · f8ef35e
1 parent 03d6407
commit f8ef35e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m b/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m
@@ -24,23 +24,20 @@ - (void)layoutSubviews {
 	}
 	[super layoutSubviews];
 
-	CGFloat viewWidth =  [self.textLabel superview].frame.size.width;
+	CGSize viewSize =  [self.textLabel superview].frame.size;
 
 	// set the left title label frame
 	CGFloat labelWidth = [self.textLabel sizeThatFits:CGSizeZero].width;
-	labelWidth = MIN(labelWidth, viewWidth - kIASKMinValueWidth - kIASKPaddingLeft - kIASKSpacing -kIASKPaddingRight);
-	CGRect labelFrame = self.textLabel.frame;
-	labelFrame.origin.x = kIASKPaddingLeft;
-	labelFrame.size.width = labelWidth;
-	labelFrame.size.height -= 2;
+	labelWidth = MIN(labelWidth, viewSize.width - kIASKMinValueWidth - kIASKPaddingLeft - kIASKSpacing -kIASKPaddingRight);
+	CGRect labelFrame = CGRectMake(kIASKPaddingLeft, 0, labelWidth, viewSize.height -2);
 	self.textLabel.frame = labelFrame;
 
 	// set the right value label frame
 	if (self.detailTextLabel.text.length) {
-		CGRect valueFrame = self.detailTextLabel.frame;
-		valueFrame.origin.x = kIASKPaddingLeft + labelWidth + kIASKSpacing;
-		valueFrame.size.width = viewWidth - valueFrame.origin.x - kIASKPaddingRight;
-		valueFrame.size.height -= 2;
+		CGRect valueFrame = CGRectMake(kIASKPaddingLeft + labelWidth + kIASKSpacing,
+									   0,
+									   viewSize.width - (kIASKPaddingLeft + labelWidth + kIASKSpacing) - kIASKPaddingRight,
+									   viewSize.height -2);
 		self.detailTextLabel.frame = valueFrame;
 	}
 }