Merge pull request #13 from teambition/fix/selected-title-truncated

fix: fix selected title truncated issue
teambition · May 12, 2020 · d4b94b9 · d4b94b9
2 parents e9694a2 + fea3699
commit d4b94b9
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/SegmentedControl/SegmentedControl.swift b/SegmentedControl/SegmentedControl.swift
@@ -15,6 +15,9 @@ open class SegmentedControl: UIControl {
 
     open fileprivate(set) var selectedIndex = 0 {
         didSet {
+            if selectedIndex != oldValue {
+                updateTitleSizes()
+            }
             setNeedsDisplay()
         }
     }
@@ -57,7 +60,7 @@ open class SegmentedControl: UIControl {
 
     open fileprivate(set) var titles = [NSAttributedString]() {
         didSet {
-            titleSizes = titles.map { sizeForAttributedString($0) }
+            updateTitleSizes()
         }
     }
     open fileprivate(set) var selectedTitles: [NSAttributedString]?
@@ -68,6 +71,17 @@ open class SegmentedControl: UIControl {
 
     fileprivate var titleSizes = [CGSize]()
 
+    private func updateTitleSizes() {
+        titleSizes = titles.enumerated().map({ (offset, title) in
+            if offset == selectedIndex,
+                let selected = selectedTitles,
+                0..<selected.count ~= offset {
+                return sizeForAttributedString(selected[offset])
+            }
+            return sizeForAttributedString(title)
+        })
+    }
+
     open var isLongPressEnabled = false {
         didSet {
             if isLongPressEnabled {