BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Positioning cursor over deskshare whiteboard on the playback

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2016-12-16 12:49:46 +00:00
parent 8ca6ecacee
commit 0223faec5a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
View File

@ -43,17 +43,22 @@ function drawCursor(scaledX, scaledY, img) {
var imageX = 0; //imgRect.x; var imageX = 0; //imgRect.x;
var imageY = 0; //imgRect.y; var imageY = 0; //imgRect.y;
// Important to place the cursor over the deskshare
// It should not affect the regular slides
var scaledWidthOffset = widthOffset * (containerObj.width() / deskshareWidth);
var scaledHeightOffset = heightOffset * (containerObj.height() / deskshareHeight);
// the offsets of the container that has the image inside it // the offsets of the container that has the image inside it
var containerX = containerObj.offset().left; var containerX = containerObj.offset().left - scaledWidthOffset;
var containerY = containerObj.offset().top; var containerY = containerObj.offset().top - scaledHeightOffset;
// calculates the overall offsets of the image in the page // calculates the overall offsets of the image in the page
var imageOffsetX = containerX + imageX; var imageOffsetX = containerX + imageX;
var imageOffsetY = containerY + imageY; var imageOffsetY = containerY + imageY;
// position of the cursor relative to the container // position of the cursor relative to the container
var cursorXInImage = scaledX * containerObj.width(); var cursorXInImage = scaledX * (containerObj.width() * widthScale);
var cursorYInImage = scaledY * containerObj.height(); var cursorYInImage = scaledY * (containerObj.height() * heightScale);
// absolute position of the cursor in the page // absolute position of the cursor in the page
var cursorLeft = parseInt(imageOffsetX + cursorXInImage, 10); var cursorLeft = parseInt(imageOffsetX + cursorXInImage, 10);
@ -518,8 +523,8 @@ function setDeskshareScale(viewBox) {
} }
function setDeskshareOffset(viewBox) { function setDeskshareOffset(viewBox) {
widthOffset = ((viewBox[2] - deskshareWidth) / widthScale) / 2; widthOffset = (viewBox[2] - deskshareWidth) / 2;
heightOffset = ((viewBox[3] - deskshareHeight) / heightScale) / 2; heightOffset = (viewBox[3] - deskshareHeight) / 2;
} }
// Deskshare viewBox must be moved to be placed above the video // Deskshare viewBox must be moved to be placed above the video
@ -527,8 +532,8 @@ function adaptViewBoxToDeskshare(viewBox) {
var vb = viewBox.split(" "); var vb = viewBox.split(" ");
setDeskshareScale(vb); setDeskshareScale(vb);
setDeskshareOffset(vb); setDeskshareOffset(vb);
vb[0] = widthOffset; vb[0] = widthOffset / widthScale;
vb[1] = heightOffset; vb[1] = heightOffset / heightScale;
vb[2] = deskshareWidth; vb[2] = deskshareWidth;
vb[3] = deskshareHeight; vb[3] = deskshareHeight;
return vb.join(" "); return vb.join(" ");