浏览代码

Merge pull request #377 from game3108/master

bug fix: use greaterThanOrEqualTo or lessThanOrEqualTo to add a attri…
Robert Payne 9 年之前
父节点
当前提交
16c7f0a314
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      Masonry/MASViewConstraint.m
  2. 1 1
      Tests/Specs/NSLayoutConstraint+MASDebugAdditionsSpec.m

+ 1 - 0
Masonry/MASViewConstraint.m

@@ -175,6 +175,7 @@ static char kInstalledConstraintsKey;
             NSMutableArray *children = NSMutableArray.new;
             NSMutableArray *children = NSMutableArray.new;
             for (id attr in attribute) {
             for (id attr in attribute) {
                 MASViewConstraint *viewConstraint = [self copy];
                 MASViewConstraint *viewConstraint = [self copy];
+                viewConstraint.layoutRelation = relation;
                 viewConstraint.secondViewAttribute = attr;
                 viewConstraint.secondViewAttribute = attr;
                 [children addObject:viewConstraint];
                 [children addObject:viewConstraint];
             }
             }

+ 1 - 1
Tests/Specs/NSLayoutConstraint+MASDebugAdditionsSpec.m

@@ -53,7 +53,7 @@ SpecBegin(NSLayoutConstraint_MASDebugAdditions)
     }];
     }];
 
 
 
 
-    NSString *description = [NSString stringWithFormat:@"<MASLayoutConstraint:left[0] %@:newView1.left == %@:newView2.left>", MAS_VIEW.class, MAS_VIEW.class];
+    NSString *description = [NSString stringWithFormat:@"<MASLayoutConstraint:left[0] %@:newView1.left >= %@:newView2.left>", MAS_VIEW.class, MAS_VIEW.class];
     expect([superview.constraints[0] description]).to.equal(description);
     expect([superview.constraints[0] description]).to.equal(description);
 }
 }