From 8ccbfc55c80e0ea410c4237fd35cd68f030dee35 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 23 Mar 2012 13:50:49 +0100 Subject: [PATCH] Hide video view by default --- Classes/IncallViewController.m | 6 +++++- Classes/IncallViewController.xib | 30 +++++++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index f4c0d7d0f..cede3d142 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -216,6 +216,9 @@ void addAnimationFadeTransition(UIView* view, float duration) { [callTableView setAlpha:0.0]; [UIView commitAnimations]; + videoView.alpha = 1.0; + videoView.hidden = FALSE; + linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView); linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)videoPreview); @@ -228,7 +231,6 @@ void addAnimationFadeTransition(UIView* view, float duration) { NSLog(@"new center: %f %f", videoView.center.x, videoView.center.y); done = true; } - } -(void) disableVideoDisplay { @@ -371,6 +373,8 @@ void addAnimationFadeTransition(UIView* view, float duration) { UITapGestureRecognizer* singleFingerTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(showControls:)]; [videoGroup addGestureRecognizer:singleFingerTap]; + videoGroup.alpha = 0; + [singleFingerTap release]; mVideoShown=FALSE; diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib index ef6e7df9a..3d53bbb0b 100644 --- a/Classes/IncallViewController.xib +++ b/Classes/IncallViewController.xib @@ -56,9 +56,9 @@ _NS:196 - - 3 - MCAwAA + + 2 + MSAwLjU3MjI5NTY2NTcgMC41NzIzMDYyNzU0AA IBCocoaTouchFramework @@ -68,13 +68,10 @@ {{240, 354}, {80, 106}} - + - 3 - MQA - - 2 - + 1 + MC41MTk0NjE2OTQgMSAwLjA4NjA4NjE0NwA IBCocoaTouchFramework @@ -95,7 +92,10 @@ _NS:196 - + + 1 + MC40MzUwMTEzNDA3IDAuNjI1IDEAA + NO IBCocoaTouchFramework @@ -105,7 +105,7 @@ {320, 66} - + 1 MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA @@ -153,7 +153,10 @@ _NS:418 - + + 3 + MCAwAA + YES IBCocoaTouchFramework YES @@ -367,6 +370,7 @@ MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + NSImage clavier-01-160px.png @@ -484,7 +488,7 @@ {{119, 251}, {82, 52}} - + NO NO