Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
  • Loading branch information
Antreesy committed Mar 4, 2024
1 parent 82d5ea9 commit e179487
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
3 changes: 1 addition & 2 deletions src/components/TopBar/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@
<TopBarMediaControls v-if="isInCall"
:token="token"
:model="localMediaModel"
:show-actions="!isSidebar"
:screen-sharing-button-hidden="isSidebar"
:is-sidebar="isSidebar"
:local-call-participant-model="localCallParticipantModel" />

<!-- TopBar menu -->
Expand Down
19 changes: 4 additions & 15 deletions src/components/TopBar/TopBarMediaControls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
:model="model"
type="tertiary" />

<NcButton v-if="isVirtualBackgroundAvailable && !showActions"
<NcButton v-if="isVirtualBackgroundAvailable && !!isSidebar"
v-tooltip="toggleVirtualBackgroundButtonLabel"
type="tertiary"
:aria-label="toggleVirtualBackgroundButtonLabel"
Expand All @@ -82,7 +82,7 @@
</template>
</NcButton>

<NcActions v-if="!screenSharingButtonHidden && isScreensharing"
<NcActions v-if="!isSidebar && isScreensharing"
id="screensharing-button"
v-tooltip="screenSharingButtonTooltip"
type="error"
Expand All @@ -92,11 +92,9 @@
:boundaries-element="boundaryElement"
:container="container"
:open.sync="screenSharingMenuOpen">
<!-- Actions button icon -->
<template #icon>
<MonitorOff v-if="isScreensharing" :size="20" />
<MonitorOff :size="20" />
</template>
<!-- /Actions button icon -->
<!-- Actions -->
<NcActionButton close-after-click @click="showScreen">
<template #icon>
Expand All @@ -111,7 +109,7 @@
{{ t('spreed', 'Stop screensharing') }}
</NcActionButton>
</NcActions>
<NcButton v-else-if="!screenSharingButtonHidden"
<NcButton v-else-if="!isSidebar"
v-tooltip="screenSharingButtonTooltip"
type="tertiary"
@click.stop="toggleScreenSharingMenu">
Expand Down Expand Up @@ -186,15 +184,6 @@ export default {
type: Object,
required: true,
},
screenSharingButtonHidden: {
type: Boolean,
default: false,
},
showActions: {
type: Boolean,
default: true,
},
/**
* In the sidebar the conversation settings are hidden
*/
Expand Down

0 comments on commit e179487

Please sign in to comment.