Browse Source

Allow automagic constraining

Robert Payne 11 years ago
parent
commit
4abf189fc9
2 changed files with 7 additions and 4 deletions
  1. 6 3
      Snappy/Constraint.swift
  2. 1 1
      SnappyExample/ViewController.swift

+ 6 - 3
Snappy/Constraint.swift

@@ -323,9 +323,6 @@ class Constraint {
         // get layout from
         let layoutFrom: View? = self.fromItem.view
         
-        // get layout to
-        let layoutTo: View? = self.toItem.view
-        
         // get layout relation
         let layoutRelation: NSLayoutRelation = (self.relation != nil) ? self.relation!.layoutRelation : .Equal
         
@@ -337,6 +334,12 @@ class Constraint {
             var layoutConstant: CGFloat = layoutToAttribute.snp_constantForValue(self.constant)
             layoutConstant += layoutToAttribute.snp_offsetForValue(self.offset)
             
+            // get layout to
+            var layoutTo: View? = self.toItem.view
+            if layoutTo == nil && layoutToAttribute != .Width && layoutToAttribute != .Height {
+                layoutTo = installOnView
+            }
+            
             // create layout constraint
             let layoutConstraint = LayoutConstraint(
                 item: layoutFrom,

+ 1 - 1
SnappyExample/ViewController.swift

@@ -37,7 +37,7 @@ class ViewController: UIViewController {
         
         
         view1.snp_makeConstraints { make in
-            make.top.and.left.equalTo(superview).insets(padding)
+            make.top.and.left.equalTo(CGPointZero).insets(padding)
             make.size.equalTo(CGSizeMake(100, 50))
         }