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

Merge pull request #4115 from capilkey/cleanup-old-1.1-apps

Browse Source 
Presenter and slide size fix for 2.0
This commit is contained in:
Chad Pilkey 2017-07-18 13:03:55 -04:00 committed by GitHub
commit 20fe7c2f24
2 changed files with 15 additions and 12 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

@ -122,7 +122,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
[Bindable] private var DEFAULT_X_POSITION:Number = 237;
[Bindable] private var DEFAULT_Y_POSITION:Number = 0;
private static const TOP_WINDOW_BORDER:Number = 54;
private static const TOP_WINDOW_BORDER:Number = 30;
private static const WIDTH_PADDING:Number = 8;
[Bindable] private var DEFAULT_WINDOW_WIDTH:Number = 510;

25
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
View File

@ -594,11 +594,13 @@ package org.bigbluebutton.modules.users.services
UsersUtil.setUserAsPresent(newPresenterID, true);
sendSwitchedPresenterEvent(true, newPresenterID);
var e:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_PRESENTER_MODE);
e.userID = newPresenterID;
e.presenterName = newPresenterName;
e.assignedBy = assignedBy;
dispatcher.dispatchEvent(e);
if (UsersUtil.getMyUserID() == newPresenterID) {
var e:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_PRESENTER_MODE);
e.userID = newPresenterID;
e.presenterName = newPresenterName;
e.assignedBy = assignedBy;
dispatcher.dispatchEvent(e);
}
dispatcher.dispatchEvent(new UserStatusChangedEvent(newPresenterID));
}
@ -613,12 +615,13 @@ package org.bigbluebutton.modules.users.services
UsersUtil.setUserAsPresent(oldPresenterID, false);
sendSwitchedPresenterEvent(false, oldPresenterID);
var e:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_VIEWER_MODE);
e.userID = oldPresenterID;
e.presenterName = oldPresenterName;
e.assignedBy = assignedBy;
dispatcher.dispatchEvent(e);
if (UsersUtil.getMyUserID() == oldPresenterID) {
var e:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_VIEWER_MODE);
e.userID = oldPresenterID;
e.presenterName = oldPresenterName;
e.assignedBy = assignedBy;
dispatcher.dispatchEvent(e);
}
dispatcher.dispatchEvent(new UserStatusChangedEvent(oldPresenterID));
}