ios / Masonry · Commits

Go to a project

Authored by Robert Payne
Commit dee6d8d5dd1b74e32a6f0f11edfc7a8005256609 2 parents 4f55bc5f 32b8be9a

Merge branch 'master' of github.com:Masonry/Masonry

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
@@ -343,6 +343,7 @@ @@ -343,6 +343,7 @@
343 isa = XCBuildConfiguration; 343 isa = XCBuildConfiguration;
344 buildSettings = { 344 buildSettings = {
345 ALWAYS_SEARCH_USER_PATHS = NO; 345 ALWAYS_SEARCH_USER_PATHS = NO;
  346 + APPLICATION_EXTENSION_API_ONLY = YES;
346 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 347 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
347 CLANG_CXX_LIBRARY = "libc++"; 348 CLANG_CXX_LIBRARY = "libc++";
348 CLANG_ENABLE_MODULES = YES; 349 CLANG_ENABLE_MODULES = YES;
@@ -391,6 +392,7 @@ @@ -391,6 +392,7 @@
391 isa = XCBuildConfiguration; 392 isa = XCBuildConfiguration;
392 buildSettings = { 393 buildSettings = {
393 ALWAYS_SEARCH_USER_PATHS = NO; 394 ALWAYS_SEARCH_USER_PATHS = NO;
  395 + APPLICATION_EXTENSION_API_ONLY = YES;
394 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 396 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
395 CLANG_CXX_LIBRARY = "libc++"; 397 CLANG_CXX_LIBRARY = "libc++";
396 CLANG_ENABLE_MODULES = YES; 398 CLANG_ENABLE_MODULES = YES;
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 if (prev) { 53 if (prev) {
54 make.width.equalTo(prev); 54 make.width.equalTo(prev);
55 make.left.equalTo(prev.mas_right).offset(fixedSpacing); 55 make.left.equalTo(prev.mas_right).offset(fixedSpacing);
56 - if (i == (CGFloat)self.count - 1) {//last one 56 + if (i == self.count - 1) {//last one
57 make.right.equalTo(tempSuperView).offset(-tailSpacing); 57 make.right.equalTo(tempSuperView).offset(-tailSpacing);
58 } 58 }
59 } 59 }
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 if (prev) { 73 if (prev) {
74 make.height.equalTo(prev); 74 make.height.equalTo(prev);
75 make.top.equalTo(prev.mas_bottom).offset(fixedSpacing); 75 make.top.equalTo(prev.mas_bottom).offset(fixedSpacing);
76 - if (i == (CGFloat)self.count - 1) {//last one 76 + if (i == self.count - 1) {//last one
77 make.bottom.equalTo(tempSuperView).offset(-tailSpacing); 77 make.bottom.equalTo(tempSuperView).offset(-tailSpacing);
78 } 78 }
79 } 79 }
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 if (prev) { 102 if (prev) {
103 CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1)); 103 CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1));
104 make.width.equalTo(@(fixedItemLength)); 104 make.width.equalTo(@(fixedItemLength));
105 - if (i == (CGFloat)self.count - 1) {//last one 105 + if (i == self.count - 1) {//last one
106 make.right.equalTo(tempSuperView).offset(-tailSpacing); 106 make.right.equalTo(tempSuperView).offset(-tailSpacing);
107 } 107 }
108 else { 108 else {
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 if (prev) { 125 if (prev) {
126 CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1)); 126 CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1));
127 make.height.equalTo(@(fixedItemLength)); 127 make.height.equalTo(@(fixedItemLength));
128 - if (i == (CGFloat)self.count - 1) {//last one 128 + if (i == self.count - 1) {//last one
129 make.bottom.equalTo(tempSuperView).offset(-tailSpacing); 129 make.bottom.equalTo(tempSuperView).offset(-tailSpacing);
130 } 130 }
131 else { 131 else {