fixup! feat: switch focus to screenshare button instead of end call b…

…utton
nextcloud · Feb 14, 2024 · b67bdcb · b67bdcb
1 parent 000e046
commit b67bdcb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 43 deletions.
diff --git a/src/components/CallView/shared/LocalAudioControlButton.vue b/src/components/CallView/shared/LocalAudioControlButton.vue
@@ -30,7 +30,6 @@
 				:audio-enabled="showMicrophoneOn"
 				:current-volume="model.attributes.currentVolume"
 				:volume-threshold="model.attributes.volumeThreshold"
-				:primary-color="color"
 				overlay-muted-color="#888888" />
 		</template>
 	</NcButton>
@@ -75,11 +74,6 @@ export default {
 			default: 'tertiary-no-background',
 		},
 
-		color: {
-			type: String,
-			default: 'currentColor',
-		},
-
 		token: {
 			type: String,
 			required: true,

diff --git a/src/components/CallView/shared/LocalVideoControlButton.vue b/src/components/CallView/shared/LocalVideoControlButton.vue
@@ -26,8 +26,8 @@
 		@shortkey="toggleVideo"
 		@click.stop="toggleVideo">
 		<template #icon>
-			<VideoIcon v-if="showVideoOn" :size="20" :fill-color="color" />
-			<VideoOff v-else :size="20" :fill-color="color" />
+			<VideoIcon v-if="showVideoOn" :size="20" />
+			<VideoOff v-else :size="20" />
 		</template>
 	</NcButton>
 </template>
@@ -73,11 +73,6 @@ export default {
 			default: 'tertiary-no-background',
 		},
 
-		color: {
-			type: String,
-			default: 'currentColor',
-		},
-
 		token: {
 			type: String,
 			required: true,

diff --git a/src/components/CallView/shared/ViewerOverlayCallView.vue b/src/components/CallView/shared/ViewerOverlayCallView.vue
@@ -106,13 +106,13 @@
 								:token="token"
 								:conversation="conversation"
 								:model="localModel"
-								nc-button-type="secondary"
+								type="secondary"
 								disable-keyboard-shortcuts />
 							<LocalVideoControlButton class="viewer-overlay__button"
 								:token="token"
 								:conversation="conversation"
 								:model="localModel"
-								nc-button-type="secondary"
+								type="secondary"
 								disable-keyboard-shortcuts />
 						</div>
 					</div>

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
@@ -69,14 +69,13 @@
 			type="tertiary"
 			@click="openSidebar('participants')">
 			<template #icon>
-				<AccountMultiple :size="20"
-					fill-color="#ffffff" />
+				<AccountMultiple :size="20" />
 			</template>
 			{{ participantsInCall }}
 		</NcButton>
 
 		<!-- Reactions menu -->
-		<ReactionMenu v-if="hasReactionSupport"
+		<ReactionMenu v-if="isInCall && hasReactionSupport"
 			:token="token"
 			:supported-reactions="supportedReactions"
 			:local-call-participant-model="localCallParticipantModel" />
@@ -120,8 +119,7 @@
 				type="tertiary"
 				@click="openSidebar('chat')">
 				<template #icon>
-					<MessageText :size="20"
-						fill-color="#ffffff" />
+					<MessageText :size="20" />
 					<NcCounterBubble v-if="unreadMessagesCounter > 0"
 						class="chat-button__unread-messages-counter"
 						:type="hasUnreadMentions ? 'highlighted' : 'outlined'">

diff --git a/src/components/TopBar/TopBarMediaControls.vue b/src/components/TopBar/TopBarMediaControls.vue
@@ -63,14 +63,12 @@
 			:token="token"
 			:conversation="conversation"
 			:model="model"
-			type="tertiary"
-			color="#ffffff" />
+			type="tertiary" />
 
 		<LocalVideoControlButton :token="token"
 			:conversation="conversation"
 			:model="model"
-			type="tertiary"
-			color="#ffffff" />
+			type="tertiary" />
 
 		<NcButton v-if="isVirtualBackgroundAvailable && !showActions"
 			v-tooltip="toggleVirtualBackgroundButtonLabel"
@@ -79,8 +77,8 @@
 			:class="blurButtonClass"
 			@click.stop="toggleVirtualBackground">
 			<template #icon>
-				<Blur v-if="isVirtualBackgroundEnabled" :size="20" fill-color="#ffffff" />
-				<BlurOff v-else :size="20" fill-color="#ffffff" />
+				<Blur v-if="isVirtualBackgroundEnabled" :size="20" />
+				<BlurOff v-else :size="20" />
 			</template>
 		</NcButton>
 
@@ -96,32 +94,29 @@
 			:open.sync="screenSharingMenuOpen">
 			<!-- Actions button icon -->
 			<template #icon>
-				<MonitorOff v-if="isScreensharing" :size="20" fill-color="#ffffff" />
-				<MonitorShare v-else :size="20" fill-color="#ffffff" />
+				<MonitorOff v-if="isScreensharing" :size="20" />
 			</template>
 			<!-- /Actions button icon -->
 			<!-- Actions -->
-			<template v-if="isScreensharing">
-				<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>
-						<MonitorOff :size="20" />
-					</template>
-					{{ t('spreed', 'Stop screensharing') }}
-				</NcActionButton>
-			</template>
+			<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>
+					<MonitorOff :size="20" />
+				</template>
+				{{ t('spreed', 'Stop screensharing') }}
+			</NcActionButton>
 		</NcActions>
 		<NcButton v-else-if="!screenSharingButtonHidden"
 			v-tooltip="screenSharingButtonTooltip"
 			type="tertiary"
 			@click.stop="toggleScreenSharingMenu">
 			<template #icon>
-				<MonitorShare :size="20" fill-color="#ffffff" />
+				<MonitorShare :size="20" />
 			</template>
 		</NcButton>
 	</div>