From 1172ad57d74e20b0e2c7ab044ff447678616ae6b Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 12 Nov 2015 15:45:03 +0100
Subject: [PATCH] Call: try to not resize video when toggling controls...

---
 Classes/Base.lproj/CallView.xib | 19 +++++++------------
 Classes/CallView.m              | 13 +++++--------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index 9fb54a674..ed394cfe1 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CallView">
@@ -126,7 +126,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Contact avatar">
-                                        <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
+                                        <accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
                                         <bool key="isElement" value="YES"/>
                                     </accessibility>
                                 </imageView>
@@ -142,11 +142,11 @@
                                         </view>
                                         <view contentMode="scaleToFill" id="132" userLabel="display">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="499"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <animations/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <accessibility key="accessibilityConfiguration">
-                                                <accessibilityTraits key="traits" none="YES" notEnabled="YES"/>
+                                                <accessibilityTraits key="traits" notEnabled="YES"/>
                                             </accessibility>
                                         </view>
                                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
@@ -233,7 +233,7 @@
                                 </button>
                             </subviews>
                             <animations/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </view>
                         <view hidden="YES" contentMode="scaleToFill" id="aqL-q2-eR2" userLabel="noActiveCallView">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="499"/>
@@ -694,7 +694,7 @@
                         </view>
                     </subviews>
                     <animations/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
             </subviews>
             <animations/>
@@ -779,9 +779,4 @@
         <image name="speaker_selected.png" width="27" height="25"/>
         <image name="waiting_time.png" width="59" height="71"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/CallView.m b/Classes/CallView.m
index ccc457916..2769e5340 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -299,9 +299,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 		_routesView.alpha = _optionsView.alpha = _numpadView.alpha = _bottomBar.alpha = 1.0;
 		_nameLabel.alpha = _durationLabel.alpha = .8;
 
-		CGRect newFrame = self.view.frame;
-		newFrame.size.height -= _bottomBar.frame.size.height;
-		_callView.frame = newFrame;
+		//		CGRect newFrame = self.view.frame;
+		//		newFrame.size.height -= _bottomBar.frame.size.height;
+		//		_callView.frame = newFrame;
 
 		[UIView commitAnimations];
 
@@ -332,13 +332,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 		_pausedCallsTable.tableView.alpha = _videoCameraSwitch.alpha = _nameLabel.alpha = _durationLabel.alpha =
 			_callPauseButton.alpha = 0.0;
 		_routesView.alpha = _optionsView.alpha = _numpadView.alpha = _bottomBar.alpha = 0.0;
-		CGRect newFrame = self.view.frame;
-		_callView.frame = newFrame;
+		//		CGRect newFrame = self.view.frame;
+		//		_callView.frame = newFrame;
 
 		[UIView commitAnimations];
-
-		//		UICompositeView *cvc = PhoneMainView.instance.mainViewController;
-		//		[cvc hideSideMenu:YES];
 	}
 }