|
@@ -25,6 +25,11 @@ type Props = {
|
25
|
25
|
*/
|
26
|
26
|
clientWidth: number,
|
27
|
27
|
|
|
28
|
+ /**
|
|
29
|
+ * Whether the (vertical) filmstrip is visible or not.
|
|
30
|
+ */
|
|
31
|
+ filmstripVisible: boolean,
|
|
32
|
+
|
28
|
33
|
/**
|
29
|
34
|
* Is the video shared by the local user.
|
30
|
35
|
*
|
|
@@ -59,16 +64,24 @@ class SharedVideo extends Component<Props> {
|
59
|
64
|
* }}
|
60
|
65
|
*/
|
61
|
66
|
getDimensions() {
|
62
|
|
- const { clientHeight, clientWidth } = this.props;
|
|
67
|
+ const { clientHeight, clientWidth, filmstripVisible } = this.props;
|
63
|
68
|
|
64
|
69
|
let width;
|
65
|
70
|
let height;
|
66
|
71
|
|
67
|
72
|
if (interfaceConfig.VERTICAL_FILMSTRIP) {
|
|
73
|
+ if (filmstripVisible) {
|
|
74
|
+ width = `${clientWidth - Filmstrip.getVerticalFilmstripWidth()}px`;
|
|
75
|
+ } else {
|
|
76
|
+ width = `${clientWidth}px`;
|
|
77
|
+ }
|
68
|
78
|
height = `${clientHeight - getToolboxHeight()}px`;
|
69
|
|
- width = `${clientWidth - Filmstrip.getVerticalFilmstripWidth()}px`;
|
70
|
79
|
} else {
|
71
|
|
- height = `${clientHeight - Filmstrip.getFilmstripHeight()}px`;
|
|
80
|
+ if (filmstripVisible) {
|
|
81
|
+ height = `${clientHeight - Filmstrip.getFilmstripHeight()}px`;
|
|
82
|
+ } else {
|
|
83
|
+ height = `${clientHeight}px`;
|
|
84
|
+ }
|
72
|
85
|
width = `${clientWidth}px`;
|
73
|
86
|
}
|
74
|
87
|
|
|
@@ -132,12 +145,14 @@ class SharedVideo extends Component<Props> {
|
132
|
145
|
function _mapStateToProps(state) {
|
133
|
146
|
const { ownerId, videoUrl } = state['features/shared-video'];
|
134
|
147
|
const { clientHeight, clientWidth } = state['features/base/responsive-ui'];
|
|
148
|
+ const { visible } = state['features/filmstrip'];
|
135
|
149
|
|
136
|
150
|
const localParticipant = getLocalParticipant(state);
|
137
|
151
|
|
138
|
152
|
return {
|
139
|
153
|
clientHeight,
|
140
|
154
|
clientWidth,
|
|
155
|
+ filmstripVisible: visible,
|
141
|
156
|
isOwner: ownerId === localParticipant.id,
|
142
|
157
|
sharedVideoId: videoUrl,
|
143
|
158
|
sharedYoutubeVideoId: getYoutubeId(videoUrl)
|