Merge branch 'charlesmchen/callNavigationAnimations'

7 years ago · 3d08f1fbad
parent e142aa43e3 40879461b0
commit 3d08f1fbad
1 changed files with 4 additions and 0 deletions
--- a/SignalMessaging/ViewControllers/OWSNavigationController.m
+++ b/SignalMessaging/ViewControllers/OWSNavigationController.m
@ -112,6 +112,8 @@ NS_ASSUME_NONNULL_BEGIN
 {
    DDLogDebug(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);

+    [UIView setAnimationsEnabled:NO];
+
    if (@available(iOS 11.0, *)) {
        if (OWSWindowManager.sharedManager.hasCall) {
            if (UIDevice.currentDevice.isIPhoneX) {
@ -147,7 +149,9 @@ NS_ASSUME_NONNULL_BEGIN
        // Since the navbar's frame was updated, we need to be sure our child VC's
        // container view is updated.
        [self.view setNeedsLayout];
+        [self.view layoutSubviews];
    }
+    [UIView setAnimationsEnabled:YES];
 }

@end