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

Merge pull request #4350 from capilkey/2.0-fix-fittopage

Browse Source 
Fix for switching back to fit-to-page
This commit is contained in:
Fred Dixon 2017-08-31 14:56:32 -04:00 committed by GitHub
commit 457bf87a7e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,8 +264,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
fitSlideToWindowMaintainingAspectRatio();
}
[Bindable] private var fitToPage:Boolean = true;
private function fitSlideToWindowMaintainingAspectRatio():void {
if (this.minimized) return;
@ -482,9 +480,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
resourcesChanged();
}
private function onFitToPage(ftp:Boolean):void {
fitToPage = ftp;
slideView.switchToFitToPage(fitToPage);
private function onFitToPage(ftp:Boolean):void {
slideView.switchToFitToPage(ftp);
fitSlideToWindowMaintainingAspectRatio();
}

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

@ -242,6 +242,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function switchToFitToPage(ftp:Boolean):void {
slideModel.switchToFitToPage(ftp);
slideModel.onMove(0, 0); // fake a move to reset some values
onZoomSlide(100);
}

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

@ -158,6 +158,9 @@ package org.bigbluebutton.modules.present.ui.views.models
LOGGER.debug("switchToFitToPage");
this.fitToPage = ftp;
saveViewedRegion(0,0,100,100);
calculateViewportSize();
calculateViewportXY();
}