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

display ftw properly when switching pages

Browse Source
This commit is contained in:
Richard Alam 2012-02-24 16:51:18 +00:00
parent e41af8caef
commit a277d6c339
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
View File

@ -31,7 +31,7 @@
showCloseButton="false" layout="absolute" showCloseButton="false" layout="absolute"
verticalScrollPolicy="off" verticalScrollPolicy="off"
horizontalScrollPolicy="off" horizontalScrollPolicy="off"
showControls="true" resize="maximizeHandler()" showControls="true" resize="maximizeHandler()" maximize="maximizeHandler()"
backgroundColor="red" backgroundColor="red"
implements="org.bigbluebutton.common.IBbbModuleWindow" implements="org.bigbluebutton.common.IBbbModuleWindow"
creationComplete="onCreationComplete()" creationComplete="onCreationComplete()"

7
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
View File

@ -392,12 +392,11 @@
private function handleSlideLoadedCompleteEvent(event:Event):void { private function handleSlideLoadedCompleteEvent(event:Event):void {
zoomPercentage = 100; zoomPercentage = 100;
if (lateComerSynched) { if (lateComerSynched) {
slideModel.resetForNewSlide(slideLoader.content.width, slideLoader.content.height); slideModel.resetForNewSlide(slideLoader.contentWidth, slideLoader.contentHeight);
slideModel.saveViewedRegion(presenterViewedRegionX, presenterViewedRegionY, presenterViewedRegionW, presenterViewedRegionH); slideModel.saveViewedRegion(presenterViewedRegionX, presenterViewedRegionY, presenterViewedRegionW, presenterViewedRegionH);
} else { } else {
lateComerSynched = true; lateComerSynched = true;
slideModel.reset(slideLoader.content.width, slideLoader.content.height); slideModel.reset(slideLoader.contentWidth, slideLoader.contentHeight);
slideModel.saveViewedRegion(presenterViewedRegionX, presenterViewedRegionY, presenterViewedRegionW, presenterViewedRegionH); slideModel.saveViewedRegion(presenterViewedRegionX, presenterViewedRegionY, presenterViewedRegionW, presenterViewedRegionH);
} }
@ -477,7 +476,7 @@
</mx:Script> </mx:Script>
<mx:SWFLoader id="slideLoader" width="{slideModel.loaderW}" height="{slideModel.loaderH}" x="{slideModel.loaderX}" y="{slideModel.loaderY}" <mx:SWFLoader id="slideLoader" width="{slideModel.loaderW}" height="{slideModel.loaderH}" x="{slideModel.loaderX}" y="{slideModel.loaderY}"
creationComplete="listenForSlideLoadedCompleteEvent()" creationComplete="listenForSlideLoadedCompleteEvent()"
scaleContent="false" maintainAspectRatio="true" showBusyCursor="true" completeEffect="Fade"/> scaleContent="false" showBusyCursor="true" completeEffect="Fade"/>
<mx:HorizontalList id="thumbnailView" itemRenderer="org.bigbluebutton.modules.present.ui.views.Thumbnail" itemRollOver="changeIndex(event)" <mx:HorizontalList id="thumbnailView" itemRenderer="org.bigbluebutton.modules.present.ui.views.Thumbnail" itemRollOver="changeIndex(event)"

18
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/models/SlideViewModel.as
View File

@ -85,9 +85,23 @@ package org.bigbluebutton.modules.present.ui.views.models
public function reset(pageWidth:Number, pageHeight:Number):void { public function reset(pageWidth:Number, pageHeight:Number):void {
_calcPageW = _pageOrigW = pageWidth; _calcPageW = _pageOrigW = pageWidth;
_calcPageH = _pageOrigH = pageHeight; _calcPageH = _pageOrigH = pageHeight;
fitToPage = true;
if (pageHeight > pageWidth) {
fitToPage = false;
}
// LogUtil.debug("reset[" + fitToPage + "," + pageOrigW + "," + pageOrigH + "]");
} }
public function resetForNewSlide(pageWidth:Number, pageHeight:Number):void { public function resetForNewSlide(pageWidth:Number, pageHeight:Number):void {
fitToPage = true;
if (pageHeight > pageWidth) {
fitToPage = false;
}
// LogUtil.debug("resetForNewSlide[" + fitToPage + "," + pageOrigW + "," + pageOrigH + "]");
_calcPageW = _pageOrigW = pageWidth; _calcPageW = _pageOrigW = pageWidth;
_calcPageH = _pageOrigH = pageHeight; _calcPageH = _pageOrigH = pageHeight;
_calcPageX = 0; _calcPageX = 0;
@ -99,7 +113,7 @@ package org.bigbluebutton.modules.present.ui.views.models
public function parentChange(parentW:Number, parentH:Number, fitToPage:Boolean):void { public function parentChange(parentW:Number, parentH:Number, fitToPage:Boolean):void {
viewportW = this.parentW = parentW; viewportW = this.parentW = parentW;
viewportH = this.parentH = parentH; viewportH = this.parentH = parentH;
this.fitToPage = fitToPage; // this.fitToPage = fitToPage;
} }
public function calculateViewportXY():void { public function calculateViewportXY():void {
@ -235,7 +249,7 @@ package org.bigbluebutton.modules.present.ui.views.models
doWidthBoundsDetection(); doWidthBoundsDetection();
doHeightBoundsDetection(); doHeightBoundsDetection();
if (zoomValue <= HUNDRED_PERCENT) { if ((zoomValue <= HUNDRED_PERCENT) || (_calcPageW < viewportW) || (_calcPageH < viewportH)) {
_calcPageW = viewportW; _calcPageW = viewportW;
_calcPageH = viewportH; _calcPageH = viewportH;
_calcPageX = 0; _calcPageX = 0;

2
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
View File

@ -76,6 +76,8 @@ package org.bigbluebutton.modules.whiteboard.managers
} }
private function gotoPage(pageNumber:int):void{ private function gotoPage(pageNumber:int):void{
if (pages == null || pages.length < pageNumber) return;
var event:PageEvent = new PageEvent(PageEvent.CHANGE_PAGE); var event:PageEvent = new PageEvent(PageEvent.CHANGE_PAGE);
event.pageNum = pageNumber; event.pageNum = pageNumber;
this.pageNum = pageNumber; this.pageNum = pageNumber;