Merge pull request youknowone#143 from iDay/master

bug fixes
setdirection · Jan 10, 2014 · 9216f36 · 9216f36
2 parents 90700e0 + 66bfcd2
commit 9216f36
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/UI7Kit/UI7SegmentedControl.m b/UI7Kit/UI7SegmentedControl.m
@@ -104,7 +104,9 @@ - (void)_tintColorUpdated {
     [self setBackgroundImage:highlightedBackgroundImage forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
     [self setBackgroundImage:selectedBackgroundImage forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
 
-    [self setDividerImage:tintColor.image forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    if (tintColor != [UIColor clearColor]) {//use setted dividerImage
+        [self setDividerImage:tintColor.image forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    }
 
     self.layer.borderColor = tintColor.CGColor;
 }
@@ -113,7 +115,11 @@ - (void)_backgroundColorUpdated {
     if ([self titleTextAttributesForState:UIControlStateSelected]) { //if i customize a new style, no need to update this.
         return;
     }
-    NSDictionary *selectedAttributes = @{UITextAttributeTextColor: self.stackedBackgroundColor};
+//    NSDictionary *selectedAttributes = @{UITextAttributeTextColor: self.stackedBackgroundColor};
+    UIColor *tintColor = self.tintColor;
+    UIColor *whiteColor = [UIColor colorWithRed:1.0f green:1.0f blue:1.0f alpha:1.0f];
+    NSDictionary *selectedAttributes = @{UITextAttributeTextColor: [tintColor isEqual:whiteColor] ? [UIColor darkTextColor] : self.stackedBackgroundColor};//if tintColor is white, then set selectedColor to darkTextColor
+
     [self setTitleTextAttributes:selectedAttributes forState:UIControlStateSelected];
 }