fix: adjust segment position after layout

abcdev · abcdev · commit 4ac1b9d01c25 · 2019-06-20T14:45:12.000+02:00
diff --git a/LUNSegmentedControl/LUNSegmentedControl/LUNSegmentedControl/LUNSegmentedControl.m b/LUNSegmentedControl/LUNSegmentedControl/LUNSegmentedControl/LUNSegmentedControl.m
@@ -32,6 +32,7 @@ @interface LUNSegmentedControl() <UIScrollViewDelegate, UIGestureRecognizerDeleg
 @property (nonatomic, strong) NSMutableArray <NSLayoutConstraint *> *addedConstraintsToRemove;
 @property (nonatomic, assign) BOOL viewWasLayoutSubviews;
 @property (nonatomic, assign) BOOL layoutDependentValuesWasUpdated;
+@property (nonatomic, assign) BOOL layoutAfterScrolling;
 
 @end
 
@@ -68,9 +69,10 @@ - (void)layoutSubviews {
     [super layoutSubviews];
     [self layoutIfNeeded];
     self.viewWasLayoutSubviews = YES;
-    if (!self.layoutDependentValuesWasUpdated) {
+    if (!self.layoutDependentValuesWasUpdated || self.layoutAfterScrolling) {
         [self updateLayoutDependentValues];
     }
+    self.layoutAfterScrolling = YES;
 }
 
 #pragma mark - Init defaults
@@ -727,7 +729,10 @@ - (void)reloadData {
     }
 }
 - (void)updateLayoutDependentValues {
+    int state = self.currentState;
     self.currentState = 0;
+    self.currentState = self.statesCount-1;
+    self.currentState = state;
     self.layoutDependentValuesWasUpdated = YES;
 }
 
@@ -787,6 +792,7 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView {
     self.userInteractionEnabled = YES;
 }
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    self.layoutAfterScrolling = NO;
     if ([self.delegate respondsToSelector:@selector(segmentedControl:didScrollWithXOffset:)]) {
         [self.delegate segmentedControl:self didScrollWithXOffset:self.frame.size.width - self.scrollView.contentOffset.x - self.selectorView.frame.size.width];
     }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ @interface LUNSegmentedControl() <UIScrollViewDelegate, UIGestureRecognizerDeleg`
`32`	`32`	`@property (nonatomic, strong) NSMutableArray <NSLayoutConstraint > addedConstraintsToRemove;`
`33`	`33`	`@property (nonatomic, assign) BOOL viewWasLayoutSubviews;`
`34`	`34`	`@property (nonatomic, assign) BOOL layoutDependentValuesWasUpdated;`
	`35`	`+@property (nonatomic, assign) BOOL layoutAfterScrolling;`
`35`	`36`
`36`	`37`	`@end`
`37`	`38`
`@@ -68,9 +69,10 @@ - (void)layoutSubviews {`
`68`	`69`	`[super layoutSubviews];`
`69`	`70`	`[self layoutIfNeeded];`
`70`	`71`	`self.viewWasLayoutSubviews = YES;`
`71`		`- if (!self.layoutDependentValuesWasUpdated) {`
	`72`	`+ if (!self.layoutDependentValuesWasUpdated \|\| self.layoutAfterScrolling) {`
`72`	`73`	`[self updateLayoutDependentValues];`
`73`	`74`	`}`
	`75`	`+ self.layoutAfterScrolling = YES;`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`#pragma mark - Init defaults`
`@@ -727,7 +729,10 @@ - (void)reloadData {`
`727`	`729`	`}`
`728`	`730`	`}`
`729`	`731`	`- (void)updateLayoutDependentValues {`
	`732`	`+ int state = self.currentState;`
`730`	`733`	`self.currentState = 0;`
	`734`	`+ self.currentState = self.statesCount-1;`
	`735`	`+ self.currentState = state;`
`731`	`736`	`self.layoutDependentValuesWasUpdated = YES;`
`732`	`737`	`}`
`733`	`738`
`@@ -787,6 +792,7 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView {`
`787`	`792`	`self.userInteractionEnabled = YES;`
`788`	`793`	`}`
`789`	`794`	`- (void)scrollViewDidScroll:(UIScrollView *)scrollView {`
	`795`	`+ self.layoutAfterScrolling = NO;`
`790`	`796`	`if ([self.delegate respondsToSelector:@selector(segmentedControl:didScrollWithXOffset:)]) {`
`791`	`797`	`[self.delegate segmentedControl:self didScrollWithXOffset:self.frame.size.width - self.scrollView.contentOffset.x - self.selectorView.frame.size.width];`
`792`	`798`	`}`