diff --git a/Classes/LinphoneApp.xib b/Classes/LinphoneApp.xib index ed352e92e..7ebc94d9d 100644 --- a/Classes/LinphoneApp.xib +++ b/Classes/LinphoneApp.xib @@ -2,10 +2,10 @@ 1296 - 11E53 + 11D50 2182 - 1138.47 - 569.00 + 1138.32 + 568.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 1181 @@ -37,15 +37,14 @@ - 1316 + 1325 {320, 480} - 1 - MSAxIDEAA + MCAxIDAuMDA1OTY4NTkwOTc5AA NO NO @@ -54,12 +53,14 @@ YES + NO PhoneMainView 1 1 + YES IBCocoaTouchFramework NO diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 7279cef15..5c9f2b4f2 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -198,12 +198,13 @@ UIView *innerView = contentViewController.view; CGRect contentFrame = contentView.frame; + CGRect viewFrame = [self.view frame]; // Resize StateBar CGRect stateBarFrame = stateBarView.frame; - int origin = 0; + int origin = IPHONE_STATUSBAR_HEIGHT; if(currentViewDescription->fullscreen) - origin = -IPHONE_STATUSBAR_HEIGHT; + origin = 0; if(stateBarViewController != nil && currentViewDescription->stateBarEnabled) { contentFrame.origin.y = origin + stateBarFrame.size.height; @@ -216,8 +217,8 @@ // Resize TabBar CGRect tabFrame = tabBarView.frame; if(tabBarViewController != nil && currentViewDescription->tabBarEnabled) { - tabFrame.origin.y = [[UIScreen mainScreen] bounds].size.height - IPHONE_STATUSBAR_HEIGHT; - tabFrame.origin.x = [[UIScreen mainScreen] bounds].size.width; + tabFrame.origin.y = viewFrame.size.height; + tabFrame.origin.x = viewFrame.size.width; tabFrame.size.height = tabBarViewController.view.frame.size.height; tabFrame.size.width = tabBarViewController.view.frame.size.width; tabFrame.origin.y -= tabFrame.size.height; @@ -231,11 +232,11 @@ } } else { contentFrame.size.height = tabFrame.origin.y + tabFrame.size.height; - tabFrame.origin.y = [[UIScreen mainScreen] bounds].size.height - IPHONE_STATUSBAR_HEIGHT; + tabFrame.origin.y = viewFrame.size.height; } if(currentViewDescription->fullscreen) - contentFrame.size.height = [[UIScreen mainScreen] bounds].size.height + IPHONE_STATUSBAR_HEIGHT; + contentFrame.size.height = viewFrame.size.height - contentFrame.origin.y; // Resize innerView CGRect innerContentFrame = innerView.frame; diff --git a/Classes/LinphoneUI/UICompositeViewController.xib b/Classes/LinphoneUI/UICompositeViewController.xib index 4fa0262ba..181faee01 100644 --- a/Classes/LinphoneUI/UICompositeViewController.xib +++ b/Classes/LinphoneUI/UICompositeViewController.xib @@ -2,10 +2,10 @@ 1296 - 11E53 + 11D50 2182 - 1138.47 - 569.00 + 1138.32 + 568.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 1181 @@ -36,7 +36,7 @@ - 314 + 303 {{0, 23}, {320, 380}} @@ -51,7 +51,7 @@ - 274 + 303 {320, 23} @@ -66,11 +66,10 @@ - 280 + 303 {{0, 400}, {320, 60}} - _NS:9 YES @@ -217,6 +216,14 @@ ./Classes/UICompositeViewController.h + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + 0 diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index e2077c354..0877032b5 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -89,7 +89,9 @@ static PhoneMainView* phoneMainViewInstance=nil; return; [super viewDidLoad]; - [[self view] addSubview: mainViewController.view]; + + [self.view addSubview: mainViewController.view]; + [mainViewController.view setFrame:[self.view frame]]; // Init descriptions [viewDescriptions setObject:[ChatRoomViewController compositeViewDescription] forKey:[NSNumber numberWithInt: PhoneView_ChatRoom]]; diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index db8ede993..70b289625 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -2,10 +2,10 @@ 784 - 11E53 + 11D50 2182 - 1138.47 - 569.00 + 1138.32 + 568.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 1181 @@ -37,16 +37,15 @@ - 292 + 274 YES - 292 - {320, 460} + 274 + {320, 480} - _NS:9 NO IBCocoaTouchFramework @@ -56,17 +55,14 @@ - {320, 460} + {320, 480} _NS:9 - 3 - MQA - - 2 - + 1 + MCAxIDAuMDA1OTY4NTkwOTc5AA IBCocoaTouchFramework @@ -276,7 +272,7 @@ 3 background.png - {16, 16} + {640, 523} 1181