Translate origin of container view to be vertical-centered if there i…

…s enough space.
kevin-lyn · Nov 22, 2016 · fd53efb · fd53efb
1 parent 5621907
commit fd53efb
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/STPopup/STPopupController.m b/STPopup/STPopupController.m
@@ -695,19 +695,22 @@ - (void)adjustContainerViewOrigin
         offsetY = keyboardHeight;
     }
     else {
-        CGFloat spacing = 5;
-        offsetY = _containerView.frame.origin.y + _containerView.bounds.size.height - (_containerViewController.view.bounds.size.height - keyboardHeight - spacing);
-        if (offsetY <= 0) { // _containerView can be totally shown, so no need to reposition
-            return;
-        }
-
         CGFloat statusBarHeight = [UIApplication sharedApplication].statusBarFrame.size.height;
-
-        if (_containerView.frame.origin.y - offsetY < statusBarHeight) { // _containerView will be covered by status bar if it is repositioned with "offsetY"
-            offsetY = _containerView.frame.origin.y - statusBarHeight;
-            // currentTextField can not be totally shown if _containerView is going to repositioned with "offsetY"
-            if (textFieldBottomY - offsetY > _containerViewController.view.bounds.size.height - keyboardHeight - spacing) {
-                offsetY = textFieldBottomY - (_containerViewController.view.bounds.size.height - keyboardHeight - spacing);
+        if (_containerView.bounds.size.height <= _containerViewController.view.bounds.size.height - keyboardHeight - statusBarHeight) {
+            offsetY = _containerView.frame.origin.y - (statusBarHeight + (_containerViewController.view.bounds.size.height - keyboardHeight - statusBarHeight - _containerView.bounds.size.height) / 2);
+        }
+        else {
+            CGFloat spacing = 5;
+            offsetY = _containerView.frame.origin.y + _containerView.bounds.size.height - (_containerViewController.view.bounds.size.height - keyboardHeight - spacing);
+            if (offsetY <= 0) { // _containerView can be totally shown, so no need to translate the origin
+                return;
+            }
+            if (_containerView.frame.origin.y - offsetY < statusBarHeight) { // _containerView will be covered by status bar if the origin is translated by "offsetY"
+                offsetY = _containerView.frame.origin.y - statusBarHeight;
+                // currentTextField can not be totally shown if _containerView is going to repositioned with "offsetY"
+                if (textFieldBottomY - offsetY > _containerViewController.view.bounds.size.height - keyboardHeight - spacing) {
+                    offsetY = textFieldBottomY - (_containerViewController.view.bounds.size.height - keyboardHeight - spacing);
+                }
             }
         }
     }