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

- resize ftp with bounds detection

Browse Source
This commit is contained in:
Richard Alam 2012-02-08 19:28:26 +00:00
parent 4b9c1971b0
commit 6772f10d7f
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/Slide.as
View File

@ -210,21 +210,31 @@ package org.bigbluebutton.modules.present.managers
public function onResizeMove(vpx:int, vpy:int):void { public function onResizeMove(vpx:int, vpy:int):void {
if (fitToPage) { if (fitToPage) {
if (_calcPageX > 0 || _calcPageY > 0) { LogUtil.debug("** FTP resize 1 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "," + _calcPageX + "," + _calcPageY + "]");
if (_calcPageX > 0) _calcPageX = 0
if (_calcPageY > 0) _calcPageY = 0 if (_calcPageX >= 0) {
LogUtil.debug("** FTP resize 1 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]"); _calcPageX = 0;
} else if ((_calcPageW + _calcPageX*2) < viewportW) {
_calcPageX = (viewportW - _calcPageW)/2;
LogUtil.debug("** FTP resize 1.1");
} else { } else {
if (_calcPageY + _calcPageH < viewportH) { // _calcPageX = newX;
_calcPageY = (viewportH - _calcPageH); LogUtil.debug("** FTP resize 1.2");
}
if (_calcPageX + _calcPageW < viewportW) {
_calcPageX = (viewportW - _calcPageW);
}
LogUtil.debug("** FTP resize 2 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]");
} }
if (_calcPageY >= 0) {
_calcPageY = 0;
} else if ((_calcPageH + _calcPageY*2) < viewportH) {
_calcPageY = (viewportH - _calcPageH)/2;
LogUtil.debug("** FTP resize 1.3");
} else {
// _calcPageY = newY;
LogUtil.debug("** FTP resize 1.4");
}
// LogUtil.debug("** FTP resize 2 [" + viewportW + "," + viewportH + "][" + _calcPageW + "," + _calcPageH + "," + _calcPageX + "," + _calcPageY + "]"); }
} else { } else {
LogUtil.debug("** FTW resize 1 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]"); LogUtil.debug("** FTW resize 1 [" + viewportW + "," + viewportH + "][" + _calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]");
_calcPageX = 0; _calcPageX = 0;
if (_calcPageY >= 0 ) { if (_calcPageY >= 0 ) {
@ -235,7 +245,6 @@ package org.bigbluebutton.modules.present.managers
_calcPageY = (viewportH - _calcPageH)/2; _calcPageY = (viewportH - _calcPageH)/2;
LogUtil.debug("** FTW resize 2 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]"); LogUtil.debug("** FTW resize 2 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]");
} else { } else {
// _calcPageY = (viewportH - _calcPageH)/2;
LogUtil.debug("** FTW resize 2.5 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]"); LogUtil.debug("** FTW resize 2.5 [" + viewportW + "," + viewportH + "][" +_calcPageW + "," + _calcPageH + "][" + _calcPageX + "," + _calcPageY + "]");
} }