From f0a28cb2d81124845b19956b3438005158ba6c65 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 10 Dec 2015 15:01:08 +0100 Subject: [PATCH] Call: fix status bar display in video call --- Classes/CallView.m | 3 ++- Classes/LinphoneUI/UICompositeView.m | 34 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Classes/CallView.m b/Classes/CallView.m index 62268ef46..0a3af1846 100644 --- a/Classes/CallView.m +++ b/Classes/CallView.m @@ -87,7 +87,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; - [self showStatusBar:true]; + [self disableVideoDisplay:NO]; if (hideControlsTimer != nil) { [hideControlsTimer invalidate]; @@ -218,6 +218,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; [self previewTouchLift]; + [self showStatusBar:!videoShown || (_nameLabel.alpha > 0.f)]; } #pragma mark - diff --git a/Classes/LinphoneUI/UICompositeView.m b/Classes/LinphoneUI/UICompositeView.m index 8623f15c8..eff60f87f 100644 --- a/Classes/LinphoneUI/UICompositeView.m +++ b/Classes/LinphoneUI/UICompositeView.m @@ -1,21 +1,21 @@ /* UICompositeView.m - * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ +* +* Copyright (C) 2012 Belledonne Comunications, Grenoble, France +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Library General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ #import "UICompositeView.h"