haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1140 from jitsi/fix-desktop-sharing-screen-size 

fix: desktop streming screen size
This commit is contained in:
bgrozev 2016-11-11 13:53:39 -06:00 committed by GitHub
parent 611edf7e34 5545c0d905
commit 4b11767ac5
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/UI/videolayout/FilmStrip.js
View File

@ -157,7 +157,7 @@ const FilmStrip = {
*/
getFilmStripHeight() {
if (this.isFilmStripVisible()) {
return this.filmStrip.outerHeight();
return $(`.${this.filmStripContainerClassName}`).outerHeight();
} else {
return 0;
}

2
modules/UI/videolayout/LargeVideoManager.js
View File

@ -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;

4
modules/UI/videolayout/VideoContainer.js
View File

@ -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,