Skip to content
Snippets Groups Projects
Commit c8c82083 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

chatview: do not show "A call is in progress" in a call

Change-Id: I6e04c8e01e87f66a9e6da4fb32524f085066a5d0
GitLab: #940
parent 5db4d29b
No related branches found
No related tags found
No related merge requests found
......@@ -91,6 +91,7 @@ Rectangle {
}
function pushCallStackView() {
chatView.inCallView = true
if (sidePanelOnly) {
sidePanelViewStack.pop(StackView.Immediate)
sidePanelViewStack.push(callStackView, StackView.Immediate)
......@@ -102,6 +103,7 @@ Rectangle {
}
function pushCommunicationMessageWebView() {
chatView.inCallView = false
if (sidePanelOnly) {
sidePanelViewStack.pop(StackView.Immediate)
sidePanelViewStack.push(chatView, StackView.Immediate)
......@@ -412,6 +414,7 @@ Rectangle {
objectName: "chatView"
visible: false
inCallView: false
Component.onCompleted: {
MessagesAdapter.setQmlObject(this)
PositionManager.setQmlObject(this)
......
......@@ -35,6 +35,7 @@ Rectangle {
property bool allMessagesLoaded
property var mapPositions: PositionManager.mapStatus
property var inCallView: false
property int lastContentsSplitSize: JamiTheme.detailsPageMinWidth
property int lastDetailsSplitSize: JamiTheme.detailsPageMinWidth
......@@ -44,7 +45,11 @@ Rectangle {
signal messagesCleared
signal messagesLoaded
onVisibleChanged: {
onInCallViewChanged: {
notificationArea.visible = CurrentConversation.activeCalls.length > 0 && !root.inCallView
}
onVisibleChanged: {
if (visible)
return
UtilsAdapter.clearInteractionsCache(CurrentAccount.id, CurrentConversation.id)
......@@ -185,7 +190,7 @@ Rectangle {
notificationArea.uri = CurrentConversation.activeCalls[0]["uri"]
notificationArea.device = CurrentConversation.activeCalls[0]["device"]
}
notificationArea.visible = CurrentConversation.activeCalls.length > 0
notificationArea.visible = CurrentConversation.activeCalls.length > 0 && !root.inCallView
}
function onErrorsChanged() {
......@@ -227,7 +232,7 @@ Rectangle {
id: notificationArea
Layout.fillWidth: true
Layout.preferredHeight: JamiTheme.chatViewHeaderPreferredHeight
visible: false
visible: CurrentConversation.activeCalls.length > 0 && !root.inCallView
}
SplitView {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment