Fixed issue with layout in iOS v7.1 (xmartlabs#324).

mats-claassen · mats-claassen · commit 23c315b47918 · 2015-04-21T12:16:34.000-03:00
diff --git a/XLForm/XL/Cell/XLFormTextFieldCell.m b/XLForm/XL/Cell/XLFormTextFieldCell.m
@@ -180,9 +180,7 @@ -(UITextField *)textField
 -(NSArray *)layoutConstraints
 {
     NSMutableArray * result = [[NSMutableArray alloc] init];
-    [self.textLabel setContentHuggingPriority:500 forAxis:UILayoutConstraintAxisHorizontal];
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[_textLabel]-[_textField]" options:NSLayoutFormatAlignAllBaseline metrics:0 views:NSDictionaryOfVariableBindings(_textLabel, _textField)]];
-    
+    [self.textLabel setContentHuggingPriority:500 forAxis:UILayoutConstraintAxisHorizontal];    
     [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=11)-[_textField]-(>=11)-|" options:NSLayoutFormatAlignAllBaseline metrics:nil views:NSDictionaryOfVariableBindings(_textField)]];
     
     [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=11)-[_textLabel]-(>=11)-|" options:NSLayoutFormatAlignAllBaseline metrics:nil views:NSDictionaryOfVariableBindings(_textLabel)]];
diff --git a/XLForm/XL/Descriptors/XLFormSectionDescriptor.m b/XLForm/XL/Descriptors/XLFormSectionDescriptor.m
@@ -346,7 +346,7 @@ -(BOOL)isHidden
     if (self.isDirtyHidePredicateCache) {
         return [self evaluateIsHidden];
     }
-    return self.hidePredicateCache;
+    return [self.hidePredicateCache boolValue];
 }
 
 -(BOOL)evaluateIsHidden

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ -(BOOL)isHidden`
`346`	`346`	`if (self.isDirtyHidePredicateCache) {`
`347`	`347`	`return [self evaluateIsHidden];`
`348`	`348`	`}`
`349`		`- return self.hidePredicateCache;`
	`349`	`+ return [self.hidePredicateCache boolValue];`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`-(BOOL)evaluateIsHidden`