From 5545c0d905c5cf4fc09d59b50611a2559fa42ab4 Mon Sep 17 00:00:00 2001 From: yanas Date: Fri, 11 Nov 2016 11:55:18 -0600 Subject: [PATCH] fix: desktop streming screen size --- modules/UI/videolayout/FilmStrip.js | 2 +- modules/UI/videolayout/LargeVideoManager.js | 2 +- modules/UI/videolayout/VideoContainer.js | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/UI/videolayout/FilmStrip.js b/modules/UI/videolayout/FilmStrip.js index 2425cd889..2f0a24300 100644 --- a/modules/UI/videolayout/FilmStrip.js +++ b/modules/UI/videolayout/FilmStrip.js @@ -157,7 +157,7 @@ const FilmStrip = { */ getFilmStripHeight() { if (this.isFilmStripVisible()) { - return this.filmStrip.outerHeight(); + return $(`.${this.filmStripContainerClassName}`).outerHeight(); } else { return 0; } diff --git a/modules/UI/videolayout/LargeVideoManager.js b/modules/UI/videolayout/LargeVideoManager.js index 079585854..615c062c8 100644 --- a/modules/UI/videolayout/LargeVideoManager.js +++ b/modules/UI/videolayout/LargeVideoManager.js @@ -24,7 +24,7 @@ export default class LargeVideoManager { () => this.resizeContainer(VIDEO_CONTAINER_TYPE), emitter); this.addContainer(VIDEO_CONTAINER_TYPE, this.videoContainer); - // use the same video container to handle and desktop tracks + // use the same video container to handle desktop tracks this.addContainer("desktop", this.videoContainer); this.width = 0; diff --git a/modules/UI/videolayout/VideoContainer.js b/modules/UI/videolayout/VideoContainer.js index b91f6542d..62dca6133 100644 --- a/modules/UI/videolayout/VideoContainer.js +++ b/modules/UI/videolayout/VideoContainer.js @@ -32,6 +32,10 @@ function getStreamOwnerId(stream) { * ratio and fits available area with it's larger dimension. This method * ensures that whole video will be visible and can leave empty areas. * + * @param videoWidth the width of the video to position + * @param videoHeight the height of the video to position + * @param videoSpaceWidth the width of the available space + * @param videoSpaceHeight the height of the available space * @return an array with 2 elements, the video width and the video height */ function getDesktopVideoSize(videoWidth,