summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDorraJaouad <dorra.jaoued7@gmail.com>2024-05-08 15:23:40 +0200
committerMaksim Sukharev <antreesy.web@gmail.com>2024-05-13 15:02:35 +0200
commit59c39ff784e4869720a84e388d2e8d479a9c9e92 (patch)
tree7adf96dd71ca7ad20c7a5972c9612188e0b31396
parentd047542269a93ec2cd30c001533f9b73d3c88ce9 (diff)
fix: minimize the number of updates for lastIs.. and keep user preferences that are set during presentation
Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
-rw-r--r--src/components/TopBar/TopBarMenu.vue2
-rw-r--r--src/store/callViewStore.js15
2 files changed, 10 insertions, 7 deletions
diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index b04511bfe..feca083f3 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -434,7 +434,7 @@ export default {
},
changeView() {
- this.$store.dispatch('setCallViewMode', { isGrid: !this.isGrid })
+ this.$store.dispatch('setCallViewMode', { isGrid: !this.isGrid, clearLast: false })
this.$store.dispatch('selectedVideoPeerId', null)
},
diff --git a/src/store/callViewStore.js b/src/store/callViewStore.js
index 6918c3af6..cdd7dcef5 100644
--- a/src/store/callViewStore.js
+++ b/src/store/callViewStore.js
@@ -216,12 +216,15 @@ const actions = {
if (!context.getters.presentationStarted) {
return
}
-
- // restore previous state
- context.dispatch('setCallViewMode', {
- isGrid: context.getters.lastIsGrid,
- isStripeOpen: context.getters.lastIsStripeOpen,
- })
+ if (!context.getters.isGrid && !context.getters.isStripeOpen) {
+ // User didn't pick grid view during presentation
+ // restore previous state
+ context.dispatch('setCallViewMode', {
+ isGrid: context.getters.lastIsGrid,
+ isStripeOpen: context.getters.lastIsStripeOpen,
+ clearLast: false,
+ })
+ }
context.commit('presentationStarted', false)
},