Skip to content

Commit 697f06c

Browse files
authored
Merge pull request #11429 from nextcloud/feat/10563/talking-border-indicator
feat(LocalVideo): Show self talking indicator
2 parents 49309f0 + e17ff31 commit 697f06c

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/components/CallView/shared/LocalVideo.vue

+11-3
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ export default {
168168
videoContainerClass() {
169169
return {
170170
'not-connected': this.isNotConnected,
171-
speaking: this.localMediaModel.attributes.speaking,
172171
'video-container-grid': this.isGrid,
173172
'video-container-stripe': this.isStripe,
174173
'video-container-big': this.isBig,
175174
'video-container-small': this.isSmall,
176175
'hover-shadow': this.isSelectable && this.mouseover,
176+
speaking: this.localMediaModel.attributes.speaking,
177177
}
178178
},
179179

@@ -441,16 +441,24 @@ export default {
441441
margin: auto;
442442
}
443443

444-
.hover-shadow:after {
444+
.localVideoContainer:after {
445445
position: absolute;
446446
height: 100%;
447447
width: 100%;
448448
top: 0;
449449
left: 0;
450+
border-radius: calc(var(--default-clickable-area) / 2);
451+
}
452+
453+
.hover-shadow:after {
450454
content: '';
451455
box-shadow: inset 0 0 0 3px white;
452456
cursor: pointer;
453-
border-radius: calc(var(--default-clickable-area) / 2);
457+
}
458+
459+
.speaking:after {
460+
content: '';
461+
box-shadow: inset 0 0 0 2px white;
454462
}
455463

456464
.bottom-bar {

src/components/CallView/shared/VideoVue.vue

+4-7
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
:id="(placeholderForPromoted ? 'placeholder-' : '') + 'container_' + peerId + '_video_incoming'"
2424
ref="videoContainer"
2525
class="video-container"
26-
:class="[containerClass, {
27-
speaking: isSpeaking && !isBig,
28-
hover: mouseover && !unSelectable && !isBig,
29-
presenter: isPresenterOverlay && mouseover
30-
}]"
26+
:class="containerClass"
3127
@mouseover="mouseover = true"
3228
@mouseleave="mouseover = false"
3329
@click="$emit('click-video')">
@@ -300,10 +296,11 @@ export default {
300296
return {
301297
'videoContainer-dummy': this.placeholderForPromoted,
302298
'not-connected': !this.placeholderForPromoted && !this.isConnected,
303-
speaking: !this.placeholderForPromoted && this.model.attributes.speaking,
299+
speaking: !this.placeholderForPromoted && this.isSpeaking && !this.isBig,
300+
hover: this.mouseover && !this.unSelectable && !this.isBig,
304301
promoted: !this.placeholderForPromoted && this.sharedData.promoted && !this.isGrid,
302+
presenter: this.isPresenterOverlay && this.mouseover,
305303
'video-container-grid': this.isGrid,
306-
'video-container-grid--speaking': this.isSpeaking,
307304
'video-container-big': this.isBig,
308305
'one-to-one': this.isOneToOne,
309306
}

0 commit comments

Comments
 (0)