Toggle the left edge constraint before icon is added to avoid layout conflicts

bcylin · bcylin · commit 750681c1be55 · 2016-03-18T00:27:57.000+08:00
diff --git a/Source/ICTokenField.swift b/Source/ICTokenField.swift
@@ -148,14 +148,12 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
   private var leftView: UIView? {
     didSet {
       oldValue?.removeFromSuperview()
+      leftEdgeConstraint.active = leftView == nil
       if let icon = leftView {
         addSubview(icon)
         icon.translatesAutoresizingMaskIntoConstraints = false
         addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|-10-[icon]-10-[wrapper]", options: [], metrics: nil, views: ["icon": icon, "wrapper": scrollView]))
         addConstraint(NSLayoutConstraint(item: icon, attribute: .CenterY, relatedBy: .Equal, toItem: self, attribute: .CenterY, multiplier: 1, constant: 0))
-        leftEdgeConstraint.active = false
-      } else {
-        leftEdgeConstraint.active = true
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -148,14 +148,12 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele`
`148`	`148`	`private var leftView: UIView? {`
`149`	`149`	`didSet {`
`150`	`150`	`oldValue?.removeFromSuperview()`
	`151`	`+ leftEdgeConstraint.active = leftView == nil`
`151`	`152`	`if let icon = leftView {`
`152`	`153`	`addSubview(icon)`
`153`	`154`	`icon.translatesAutoresizingMaskIntoConstraints = false`
`154`	`155`	`addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:\|-10-[icon]-10-[wrapper]", options: [], metrics: nil, views: ["icon": icon, "wrapper": scrollView]))`
`155`	`156`	`addConstraint(NSLayoutConstraint(item: icon, attribute: .CenterY, relatedBy: .Equal, toItem: self, attribute: .CenterY, multiplier: 1, constant: 0))`
`156`		`- leftEdgeConstraint.active = false`
`157`		`- } else {`
`158`		`- leftEdgeConstraint.active = true`
`159`	`157`	`}`
`160`	`158`	`}`
`161`	`159`	`}`