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 { ...@@ -91,6 +91,7 @@ Rectangle {
} }
function pushCallStackView() { function pushCallStackView() {
chatView.inCallView = true
if (sidePanelOnly) { if (sidePanelOnly) {
sidePanelViewStack.pop(StackView.Immediate) sidePanelViewStack.pop(StackView.Immediate)
sidePanelViewStack.push(callStackView, StackView.Immediate) sidePanelViewStack.push(callStackView, StackView.Immediate)
...@@ -102,6 +103,7 @@ Rectangle { ...@@ -102,6 +103,7 @@ Rectangle {
} }
function pushCommunicationMessageWebView() { function pushCommunicationMessageWebView() {
chatView.inCallView = false
if (sidePanelOnly) { if (sidePanelOnly) {
sidePanelViewStack.pop(StackView.Immediate) sidePanelViewStack.pop(StackView.Immediate)
sidePanelViewStack.push(chatView, StackView.Immediate) sidePanelViewStack.push(chatView, StackView.Immediate)
...@@ -412,6 +414,7 @@ Rectangle { ...@@ -412,6 +414,7 @@ Rectangle {
objectName: "chatView" objectName: "chatView"
visible: false visible: false
inCallView: false
Component.onCompleted: { Component.onCompleted: {
MessagesAdapter.setQmlObject(this) MessagesAdapter.setQmlObject(this)
PositionManager.setQmlObject(this) PositionManager.setQmlObject(this)
......
...@@ -35,6 +35,7 @@ Rectangle { ...@@ -35,6 +35,7 @@ Rectangle {
property bool allMessagesLoaded property bool allMessagesLoaded
property var mapPositions: PositionManager.mapStatus property var mapPositions: PositionManager.mapStatus
property var inCallView: false
property int lastContentsSplitSize: JamiTheme.detailsPageMinWidth property int lastContentsSplitSize: JamiTheme.detailsPageMinWidth
property int lastDetailsSplitSize: JamiTheme.detailsPageMinWidth property int lastDetailsSplitSize: JamiTheme.detailsPageMinWidth
...@@ -44,6 +45,10 @@ Rectangle { ...@@ -44,6 +45,10 @@ Rectangle {
signal messagesCleared signal messagesCleared
signal messagesLoaded signal messagesLoaded
onInCallViewChanged: {
notificationArea.visible = CurrentConversation.activeCalls.length > 0 && !root.inCallView
}
onVisibleChanged: { onVisibleChanged: {
if (visible) if (visible)
return return
...@@ -185,7 +190,7 @@ Rectangle { ...@@ -185,7 +190,7 @@ Rectangle {
notificationArea.uri = CurrentConversation.activeCalls[0]["uri"] notificationArea.uri = CurrentConversation.activeCalls[0]["uri"]
notificationArea.device = CurrentConversation.activeCalls[0]["device"] notificationArea.device = CurrentConversation.activeCalls[0]["device"]
} }
notificationArea.visible = CurrentConversation.activeCalls.length > 0 notificationArea.visible = CurrentConversation.activeCalls.length > 0 && !root.inCallView
} }
function onErrorsChanged() { function onErrorsChanged() {
...@@ -227,7 +232,7 @@ Rectangle { ...@@ -227,7 +232,7 @@ Rectangle {
id: notificationArea id: notificationArea
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: JamiTheme.chatViewHeaderPreferredHeight Layout.preferredHeight: JamiTheme.chatViewHeaderPreferredHeight
visible: false visible: CurrentConversation.activeCalls.length > 0 && !root.inCallView
} }
SplitView { SplitView {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment