mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-04 04:19:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix Dialer preview not angled correctly at first start if the device is rotated."

Browse source 
This reverts commit 02ac9da3bd.
This commit is contained in:
Guillaume BIENKOWSKI 2014-01-13 12:01:19 +01:00
parent 7f36f72199
commit edf44eb743
2 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/DialerViewController.h
View file

@ -28,8 +28,6 @@
#import "UIDigitButton.h"
@interface DialerViewController : UIViewController <UITextFieldDelegate, UICompositeViewDelegate> {
CGFloat initialPreviewAngle;
}
- (void)setAddress:(NSString*)address;

33
Classes/DialerViewController.m
View file

@ -135,9 +135,6 @@ static UICompositeViewDescription *compositeDescription = nil;
selector:@selector(coreUpdateEvent:)
name:kLinphoneCoreUpdate
object:nil];
initialPreviewAngle = [self orientationToAngleRad:self.interfaceOrientation];
// Update on show
if([LinphoneManager isLcReady]) {
LinphoneCore* lc = [LinphoneManager getLc];
@ -214,38 +211,26 @@ static UICompositeViewDescription *compositeDescription = nil;
[super viewDidUnload];
}
- (CGFloat)orientationToAngleRad:(UIInterfaceOrientation)orientation {
CGFloat angle=0;
switch (orientation) {
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
[super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
CGRect frame = [videoPreview frame];
switch (toInterfaceOrientation) {
case UIInterfaceOrientationPortrait:
angle = 0;
[videoPreview setTransform: CGAffineTransformMakeRotation(0)];
break;
case UIInterfaceOrientationPortraitUpsideDown:
angle = M_PI;
[videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)];
break;
case UIInterfaceOrientationLandscapeLeft:
angle = M_PI / 2;
[videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)];
break;
case UIInterfaceOrientationLandscapeRight:
angle = -M_PI / 2;
[videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)];
break;
default:
break;
}
return angle;
}
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
UIInterfaceOrientation old = self.interfaceOrientation;
CGFloat angle = 0;
[super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
if( old != toInterfaceOrientation ){
CGRect frame = [videoPreview frame];
angle = [self orientationToAngleRad:toInterfaceOrientation] - initialPreviewAngle;
[videoPreview setTransform: CGAffineTransformMakeRotation(angle)];
[videoPreview setFrame:frame];
}
[videoPreview setFrame:frame];
}