From 251d18544ba6e9e30883ca2e8da3f14827c1fd4f Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Tue, 5 Mar 2024 18:33:04 +0100 Subject: [PATCH] fix(CallView): enforce switching to Speaker view when selecting a screen share to follow Signed-off-by: Maksim Sukharev --- src/components/CallView/CallView.vue | 10 +++++++++- src/components/CallView/shared/VideoBottomBar.vue | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue index a97095c468e..71ab3835acc 100644 --- a/src/components/CallView/CallView.vue +++ b/src/components/CallView/CallView.vue @@ -675,7 +675,15 @@ export default { return } - this.$store.dispatch('startPresentation') + if (this.$store.getters.presentationStarted) { + this.$store.dispatch('setCallViewMode', { + isGrid: false, + isStripeOpen: false, + clearLast: false, + }) + } else { + this.$store.dispatch('startPresentation') + } this.$store.dispatch('selectedVideoPeerId', null) this.screens.splice(index, 1) this.screens.unshift(id) diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue index 77eff1b08dc..e24d96716e9 100644 --- a/src/components/CallView/shared/VideoBottomBar.vue +++ b/src/components/CallView/shared/VideoBottomBar.vue @@ -271,7 +271,7 @@ export default { }, switchToScreen() { - if (!this.sharedData.screenVisible) { + if (!this.sharedData.screenVisible || !this.isBig) { emit('switch-screen-to-id', this.model.attributes.peerId) } },