From 1ac217b4cf3e667c864ade9a042f49026bb3bf11 Mon Sep 17 00:00:00 2001 From: Aaron ttgb Date: Tue, 15 Nov 2016 16:20:04 +0800 Subject: [PATCH 1/2] fix a bug may cause on 6/7 Plus fix a bug may cause on 6/7 Plus that display an extra line on indicator right side --- NYSegmentedControl/NYSegmentedControl.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/NYSegmentedControl/NYSegmentedControl.m b/NYSegmentedControl/NYSegmentedControl.m index 50dbcd4..b2d60d5 100644 --- a/NYSegmentedControl/NYSegmentedControl.m +++ b/NYSegmentedControl/NYSegmentedControl.m @@ -382,10 +382,11 @@ - (void)tapGestureRecognized:(UITapGestureRecognizer *)tapGestureRecognizer { #pragma mark - Helpers - (CGRect)indicatorFrameForSegment:(NYSegment *)segment { - return CGRectMake(CGRectGetMinX(segment.frame) + self.segmentIndicatorInset, - CGRectGetMinY(segment.frame) + self.segmentIndicatorInset, - CGRectGetWidth(segment.frame) - (2.0f * self.segmentIndicatorInset), - CGRectGetHeight(segment.frame) - (2.0f * self.segmentIndicatorInset)); + CGRect rect = CGRectMake(CGRectGetMinX(segment.frame) + self.segmentIndicatorInset, + CGRectGetMinY(segment.frame) + self.segmentIndicatorInset, + CGRectGetWidth(segment.frame) - (2.0f * self.segmentIndicatorInset), + CGRectGetHeight(segment.frame) - (2.0f * self.segmentIndicatorInset)); + return CGRectIntegral(rect); } #pragma mark - Getters and Setters From 03e19a69b91c06d049d510d8b2cb2e3b2a16ebe4 Mon Sep 17 00:00:00 2001 From: ttgb Date: Mon, 19 Dec 2016 15:58:53 +0800 Subject: [PATCH 2/2] remove NYSegmentLabel's maske --- NYSegmentedControl/NYSegmentLabel.m | 2 +- NYSegmentedControl/NYSegmentedControl.m | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NYSegmentedControl/NYSegmentLabel.m b/NYSegmentedControl/NYSegmentLabel.m index 2f28519..4f1153f 100644 --- a/NYSegmentedControl/NYSegmentLabel.m +++ b/NYSegmentedControl/NYSegmentLabel.m @@ -59,7 +59,7 @@ - (void)drawRect:(CGRect)rect { CGContextAddPath(context, path); // Fill the path - CGContextFillPath(context); +// CGContextFillPath(context); CFRelease(path); // Clean up diff --git a/NYSegmentedControl/NYSegmentedControl.m b/NYSegmentedControl/NYSegmentedControl.m index b2d60d5..a4d9ff5 100644 --- a/NYSegmentedControl/NYSegmentedControl.m +++ b/NYSegmentedControl/NYSegmentedControl.m @@ -176,12 +176,13 @@ - (void)layoutSubviews { if (self.selectedSegmentIndex == i) { segment.titleLabel.font = self.selectedTitleFont; segment.titleLabel.maskFrame = segment.titleLabel.bounds; + segment.titleLabel.textColor = self.selectedTitleTextColor; } else { segment.titleLabel.font = self.titleFont; + segment.titleLabel.textColor = self.titleTextColor; } segment.titleLabel.alternativeTextColor = self.selectedTitleTextColor; - segment.titleLabel.textColor = self.titleTextColor; } else { segment.titleLabel.font = self.titleFont; segment.titleLabel.textColor = self.titleTextColor;