Merge branch 'charlesmchen/callViewButtonsVsAnimations'

7 years ago · 8063886a41
parent 19ebc0f861 40ef287952
commit 8063886a41
1 changed files with 2 additions and 0 deletions
--- a/Signal/src/ViewControllers/CallViewController.swift
+++ b/Signal/src/ViewControllers/CallViewController.swift
@ -714,6 +714,8 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
            ongoingVideoCallControls.removeFromSuperview()
            ongoingCallControls.insertArrangedSubview(ongoingAudioCallControls, at: 0)
        }
+        // Layout immediately to avoid spurious animation.
+        ongoingCallControls.layoutIfNeeded()

        // Also hide other controls if user has tapped to hide them.
        if shouldRemoteVideoControlsBeHidden && !remoteVideoView.isHidden {