Removed overly complex transformation logic

Author: TimOliver

TOSegmentedControl/TOSegmentedControl.m

@@ -516,21 +516,18 @@ - (void)layoutItemViews
         UIView *itemView = item.itemView;
         [self.trackView addSubview:itemView];
 
-        // Size to fit
-        [itemView sizeToFit];
-
-        // Make sure they are all unselected
-        [self setItemAtIndex:i selected:NO];
-
         // Lay out the frame
         CGRect thumbFrame = [self frameForSegmentAtIndex:i];
         itemView.center = (CGPoint){CGRectGetMidX(thumbFrame),
                                   CGRectGetMidY(thumbFrame)};
         itemView.frame = CGRectIntegral(itemView.frame);
 
+        // Make sure they are all unselected
+        [self setItemAtIndex:i selected:NO];
+
         // If the item is disabled, make it faded
         if (!self.enabled || item.isDisabled) {
-          itemView.alpha = kTOSegmentedControlDisabledAlpha;
+            itemView.alpha = kTOSegmentedControlDisabledAlpha;
         }
 
         i++;
@@ -686,7 +683,6 @@ - (void)setItemAtIndex:(NSInteger)index selected:(BOOL)selected
 
     // Tell the segment to select itself in order to show the reversible arrow
     TOSegmentedControlSegment *segment = self.segments[index];
-    if (segment.isSelected == selected) { return; }
 
     // Update the segment state
     segment.isSelected = selected;
@@ -699,37 +695,15 @@ - (void)setItemAtIndex:(NSInteger)index selected:(BOOL)selected
     UILabel *label = segment.label;
     if (label == nil) { return; }
 
-    [UIView performWithoutAnimation:^{
-        // Capture its current position and scale
-        CGPoint center = label.center;
-        CGAffineTransform transform = label.transform;
-
-        // Reset its transform so we don't mangle the frame
-        label.transform = CGAffineTransformIdentity;
-
-        // Set the font
-        UIFont *font = selected ? self.selectedTextFont : self.textFont;
-        label.font = font;
+    // Set the font
+    UIFont *font = selected ? self.selectedTextFont : self.textFont;
+    label.font = font;
 
-        // Resize the frame in case the new font exceeded the bounds
-        [label sizeToFit];
-        label.frame = CGRectIntegral(label.frame);
+    // Re-apply the arrow image view to the translated frame
+    segment.arrowView.frame = [self frameForImageArrowViewWithItemFrame:label.frame];
 
-        // Re-apply the arrow image view to the translated frame
-        if (selected) {
-            CGAffineTransform transform = segment.arrowView.transform;
-            segment.arrowView.transform = CGAffineTransformIdentity;
-            segment.arrowView.frame = [self frameForImageArrowViewWithItemFrame:label.frame];
-            segment.arrowView.transform = transform;
-        }
-
-        // Ensure the arrow view is set to the right orientation
-        [segment setArrowImageReversed:segment.isReversed];
-
-        // Re-apply the transform and the positioning
-        label.transform = transform;
-        label.center = center;
-    }];
+    // Ensure the arrow view is set to the right orientation
+    [segment setArrowImageReversed:segment.isReversed];
 }
 
 - (void)setItemAtIndex:(NSInteger)index faded:(BOOL)faded
@@ -1262,6 +1236,11 @@ - (void)setSelectedTextFont:(UIFont *)selectedTextFont
     if (_selectedTextFont == nil) {
         _selectedTextFont = [UIFont systemFontOfSize:13.0f weight:UIFontWeightSemibold];
     }
+
+    // Set each item to adopt the new font
+    for (TOSegmentedControlSegment *item in self.segments) {
+        [item refreshItemView];
+    }
 }
 
 // -----------------------------------------------