From eac59e52945e7fe28a865cd1e9581d67f3d2c4f9 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 2 Oct 2020 13:23:52 -0400
Subject: [PATCH] mainview: prevent showing of accountComboBox when pushing
chatview onto sidepanel
Change-Id: Ifb6c321dffb90aed3e39f0ffb6426a79a00300b1
---
src/mainview/MainView.qml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 80c4e75df..0d4239063 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -501,10 +501,14 @@ Window {
}
} else if (sidePanelViewStack.visible
&& !mainViewStack.visible) {
+ // Note: the change of visibility for mainViewWindowSidePanel
+ // is to prevent accountComboBox to be shown when pushing
+ // pages to sidePanelViewStack (to be refactored)
+ mainViewWindowSidePanel.visible = false
if (callStackViewShouldShow) {
- sidePanelViewStack.push(callStackView)
+ sidePanelViewStack.push(callStackView, StackView.Immediate)
} else {
- sidePanelViewStack.push(communicationPageMessageWebView)
+ sidePanelViewStack.push(communicationPageMessageWebView, StackView.Immediate)
}
} else if (!sidePanelViewStack.visible
&& !mainViewStack.visible) {
--
GitLab