修复自定义 scrollIndicator 无效的问题

changsanjiang · Jul 21, 2020 · f557f16 · f557f16
1 parent 250495b
commit f557f16
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/SJPageViewController.podspec b/SJPageViewController.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SJPageViewController'
-  s.version          = '0.0.11'
+  s.version          = '0.0.12'
   s.summary          = 'SJPageViewController.'
 
 # This description is used to generate tags and improve search results.

diff --git a/SJPageViewController/ObjC/PageMenuBar/SJPageMenuBar.m b/SJPageViewController/ObjC/PageMenuBar/SJPageMenuBar.m
@@ -300,6 +300,16 @@ - (void)setEnabledFadeOut:(BOOL)enabledFadeOut {
     }
 }
 
+- (void)setScrollIndicator:(nullable UIView<SJPageMenuBarScrollIndicator> *)scrollIndicator {
+    if ( _scrollIndicator != scrollIndicator ) {
+        [_scrollIndicator removeFromSuperview];
+        _scrollIndicator = scrollIndicator;
+        [self.scrollView addSubview:self.scrollIndicator];
+        if ( [self _isSafeIndex:_focusedIndex] )
+            [self _remakeConstraintsForScrollIndicatorWithFocusedIndex:_focusedIndex];
+    }
+}
+
 #pragma mark -
 
 - (UIColor *)itemTintColor {

diff --git a/SJPageViewController/Swift/PageMenuBar/SJPageMenuBar.swift b/SJPageViewController/Swift/PageMenuBar/SJPageMenuBar.swift
@@ -205,7 +205,14 @@ open class SJPageMenuBar: UIView {
     }()
 
     open var scrollIndicator: SJPageMenuBarScrollIndicatorProtocol {
-        set { _scrollIndicator = newValue }
+        set {
+            _scrollIndicator.removeFromSuperview()
+            _scrollIndicator = newValue
+            addSubview(newValue)
+            if ( isSafeIndex(focusedIndex) ) {
+                remakeConstraintsForScrollIndicator(focusedIndex)
+            }
+        }
         get { return _scrollIndicator }
     }