Merge pull request #18 from MuscleRumble/master

Fixed SignUpView layout when Email is used as Username AND Additional field is being used.
parse-community · Dec 15, 2014 · 9e3c61c · 9e3c61c
2 parents 68e73b2 + 8654aee
commit 9e3c61c
Showing 1 changed file with 2 additions and 2 deletions.
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;
     }