Merge pull request #18 from MuscleRumble/master

nlutsenko · nlutsenko · commit 9e3c61cf381f · 2014-12-15T12:53:13.000Z
Fixed SignUpView layout when Email is used as Username AND Additional field is being used.
diff --git a/ParseUI/Classes/SignUpViewController/PFSignUpView.m b/ParseUI/Classes/SignUpViewController/PFSignUpView.m
@@ -171,7 +171,7 @@ - (void)layoutSubviews {
         currentY = CGRectGetMaxY(frame);
     }
 
-    if (_emailField) {
+    if (_emailField && !_emailAsUsername) {
         CGRect frame = PFRectMakeWithSizeCenteredInRect([_emailField sizeThatFits:contentSize], contentRect);
         frame.origin.y = currentY;
         _emailField.frame = frame;
@@ -226,7 +226,7 @@ - (CGSize)_contentSizeThatFits:(CGSize)boundingSize {
         CGSize fieldSize = [_passwordField sizeThatFits:boundingSize];
         size.height += fieldSize.height;
     }
-    if (_emailField) {
+    if (_emailField && !_emailAsUsername) {
         CGSize fieldSize = [_emailField sizeThatFits:boundingSize];
         size.height += fieldSize.height;
     }

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ - (void)layoutSubviews {`
`171`	`171`	`currentY = CGRectGetMaxY(frame);`
`172`	`172`	`}`
`173`	`173`
`174`		`- if (_emailField) {`
	`174`	`+ if (_emailField && !_emailAsUsername) {`
`175`	`175`	`CGRect frame = PFRectMakeWithSizeCenteredInRect([_emailField sizeThatFits:contentSize], contentRect);`
`176`	`176`	`frame.origin.y = currentY;`
`177`	`177`	`_emailField.frame = frame;`
`@@ -226,7 +226,7 @@ - (CGSize)_contentSizeThatFits:(CGSize)boundingSize {`
`226`	`226`	`CGSize fieldSize = [_passwordField sizeThatFits:boundingSize];`
`227`	`227`	`size.height += fieldSize.height;`
`228`	`228`	`}`
`229`		`- if (_emailField) {`
	`229`	`+ if (_emailField && !_emailAsUsername) {`
`230`	`230`	`CGSize fieldSize = [_emailField sizeThatFits:boundingSize];`
`231`	`231`	`size.height += fieldSize.height;`
`232`	`232`	`}`