Commit 62b08ac1 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk

callwidget: fix fullscreen behavior

Change-Id: Idb0a0b29a70b87366eb3c42caa4c6da584e535b5
Gitlab: #421Reviewed-by: Andreas Traczyk's avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 93bd2068
...@@ -146,6 +146,12 @@ CallWidget::CallWidget(QWidget* parent) : ...@@ -146,6 +146,12 @@ CallWidget::CallWidget(QWidget* parent) :
connect(ui->videoWidget, &VideoView::videoSettingsClicked, connect(ui->videoWidget, &VideoView::videoSettingsClicked,
this, &CallWidget::settingsButtonClicked); this, &CallWidget::settingsButtonClicked);
connect(ui->videoWidget, &VideoView::toggleFullScreenClicked,
this, &CallWidget::slotToggleFullScreenClicked);
connect(ui->videoWidget, &VideoView::closing,
this, &CallWidget::slotVideoViewDestroyed);
connect(ui->btnConversations, &QPushButton::clicked, connect(ui->btnConversations, &QPushButton::clicked,
this, &CallWidget::conversationsButtonClicked); this, &CallWidget::conversationsButtonClicked);
...@@ -730,7 +736,10 @@ CallWidget::slotVideoViewDestroyed(const std::string& callid) ...@@ -730,7 +736,10 @@ CallWidget::slotVideoViewDestroyed(const std::string& callid)
auto currentConversationModel = LRCInstance::getCurrentConversationModel(); auto currentConversationModel = LRCInstance::getCurrentConversationModel();
auto callModel = LRCInstance::getCurrentCallModel(); auto callModel = LRCInstance::getCurrentCallModel();
auto conversation = Utils::getConversationFromUid(convUid, *currentConversationModel); auto conversation = Utils::getConversationFromUid(convUid, *currentConversationModel);
if (callid != conversation->callId) return; if (conversation != currentConversationModel->allFilteredConversations().end() &&
callid != conversation->callId) {
return;
}
if (ui->mainActivityWidget->isFullScreen()) { if (ui->mainActivityWidget->isFullScreen()) {
ui->stackedWidget->addWidget(ui->mainActivityWidget); ui->stackedWidget->addWidget(ui->mainActivityWidget);
ui->stackedWidget->setCurrentWidget(ui->mainActivityWidget); ui->stackedWidget->setCurrentWidget(ui->mainActivityWidget);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment