diff options
| author | Maksim Sukharev <antreesy.web@gmail.com> | 2023-06-09 13:41:08 +0200 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2023-06-12 12:27:04 +0000 |
| commit | 2694b40b03c7ca892c05c37b2e4cdce104f9344f (patch) | |
| tree | e1155d1fa775492555f42dfebcf7cf63f18add5d /src | |
| parent | b8508bb2d36ce19f1feb34b49cb529c4dad31e14 (diff) | |
fix bug with disappearing screenshare button
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/TopBar/TopBarMediaControls.vue | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/components/TopBar/TopBarMediaControls.vue b/src/components/TopBar/TopBarMediaControls.vue index 6da7d75c5..580c076dd 100644 --- a/src/components/TopBar/TopBarMediaControls.vue +++ b/src/components/TopBar/TopBarMediaControls.vue @@ -84,8 +84,7 @@ :boundaries-element="boundaryElement" :container="container" :open="screenSharingMenuOpen" - @update:open="screenSharingMenuOpen = true" - @update:close="screenSharingMenuOpen = false"> + @update:open="setScreenSharingMenuOpen"> <!-- Actions button icon --> <template #icon> <CancelPresentation v-if="model.attributes.localScreen" :size="20" fill-color="#ffffff" /> @@ -100,20 +99,20 @@ </template> {{ screenSharingButtonTooltip }} </NcActionButton> - <NcActionButton v-if="model.attributes.localScreen" - @click="showScreen"> - <template #icon> - <Monitor :size="20" /> - </template> - {{ t('spreed', 'Show your screen') }} - </NcActionButton> - <NcActionButton v-if="model.attributes.localScreen" - @click="stopScreen"> - <template #icon> - <CancelPresentation :size="20" /> - </template> - {{ t('spreed', 'Stop screensharing') }} - </NcActionButton> + <template v-if="model.attributes.localScreen"> + <NcActionButton close-after-click @click="showScreen"> + <template #icon> + <Monitor :size="20" /> + </template> + {{ t('spreed', 'Show your screen') }} + </NcActionButton> + <NcActionButton close-after-click @click="stopScreen"> + <template #icon> + <CancelPresentation :size="20" /> + </template> + {{ t('spreed', 'Stop screensharing') }} + </NcActionButton> + </template> </NcActions> </div> </template> @@ -474,6 +473,10 @@ export default { } }, + setScreenSharingMenuOpen(value) { + this.screenSharingMenuOpen = value + }, + toggleScreenSharingMenu() { if (IS_DESKTOP) { alert('Unfortunately, Screen sharing is not supported by Nextcloud Talk Preview') @@ -494,7 +497,7 @@ export default { } if (this.model.attributes.localScreen) { - this.screenSharingMenuOpen = !this.screenSharingMenuOpen + this.setScreenSharingMenuOpen(!this.screenSharingMenuOpen) } else { this.startShareScreen() } @@ -504,14 +507,10 @@ export default { if (this.model.attributes.localScreen) { emit('switch-screen-to-id', this.localCallParticipantModel.attributes.peerId) } - - this.screenSharingMenuOpen = false }, stopScreen() { this.model.stopSharingScreen() - - this.screenSharingMenuOpen = false }, startShareScreen(mode) { |