From 821aa669e8ca260c18c140695ca0f4a6a6664240 Mon Sep 17 00:00:00 2001 From: Ivan Sein Date: Wed, 11 Sep 2024 17:35:36 +0200 Subject: [PATCH] Return localVideoView to original position after being pushed by right side bar. Signed-off-by: Ivan Sein --- NextcloudTalk/CallViewController.m | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/NextcloudTalk/CallViewController.m b/NextcloudTalk/CallViewController.m index a51db8251..6ae4b6d45 100644 --- a/NextcloudTalk/CallViewController.m +++ b/NextcloudTalk/CallViewController.m @@ -1615,10 +1615,19 @@ - (void)setSideBarVisible:(BOOL)visible animated:(BOOL)animated withCompletion:( [self.collectionViewRightConstraint setConstant:rightConstraintConstant]; [self adjustTopBar]; + CGPoint localVideoViewOrigin = self.localVideoView.frame.origin; + // Check if localVideoView needs to be moved to the right when sidebar is being closed + if (!visible) { + CGFloat sideBarWidthGap = self.collectionView.frame.size.width - kSidebarWidth; + if (localVideoViewOrigin.x > sideBarWidthGap) { + localVideoViewOrigin.x = self.localVideoView.superview.frame.size.width; + } + } + void (^animations)(void) = ^void() { [self.titleView layoutIfNeeded]; [self.view layoutIfNeeded]; - [self adjustLocalVideoPositionFromOriginPosition:self.localVideoView.frame.origin]; + [self adjustLocalVideoPositionFromOriginPosition:localVideoViewOrigin]; }; void (^afterAnimations)(void) = ^void() {