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

Merge branch '090-branding-logo' into mconf-live0.6.2

Browse Source 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
This commit is contained in:
Felipe Cecagno 2015-01-23 15:43:52 -02:00
commit 408e573478
1 changed files with 436 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
View File

@ -271,7 +271,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
} }
private function checkVisibility(e:MadePresenterEvent = null):void { private function checkVisibility(e:MadePresenterEvent = null):void {
if (toolbarAllowed() && slideLoaded && (wbOptions.keepToolbarVisible || mousedOver)) { if (toolbarAllowed() && slideLoaded && (wbOptions.keepToolbarVisible || mousedOver) && !presentationWindow.minimized) {
setPositionAndDepth(); setPositionAndDepth();
showToolbar(); showToolbar();
} else { } else {