diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/left-arrow.png b/bigbluebutton-client/branding/default/style/css/assets/images/left-arrow.png
index e6abeb60d45d8a2a2b0f85b741f1af14683a4c4c..0b61d9b507067f0e71d668107e68bcf106a7bead 100755
Binary files a/bigbluebutton-client/branding/default/style/css/assets/images/left-arrow.png and b/bigbluebutton-client/branding/default/style/css/assets/images/left-arrow.png differ
diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/right-arrow.png b/bigbluebutton-client/branding/default/style/css/assets/images/right-arrow.png
index 6eab9f047a5ecd05d65ac1dae3f226b80009347d..8e6e99648ad705ae23bfb428cdb7ab544fa0dd03 100755
Binary files a/bigbluebutton-client/branding/default/style/css/assets/images/right-arrow.png and b/bigbluebutton-client/branding/default/style/css/assets/images/right-arrow.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index e159a80638c001475872d57bb3d35ecba1d332f6..8e5ad915c98d3593bf9a39be22af25940652b98f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -649,38 +649,35 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true"
mouseUp="mouseDown = false" verticalScrollPolicy="off" horizontalScrollPolicy="off" tabIndex="{baseIndex+4}"/>
- <mx:ControlBar id="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}" styleName="presentationWindowControlsStyle" >
- <mx:Button id="uploadPres" visible="false" height="25" styleName="presentationUploadButtonStyle"
+ <mx:ControlBar id="presCtrlBar" name="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}" styleName="presentationWindowControlsStyle" >
+ <mx:Button id="uploadPres" visible="false" height="30" styleName="presentationUploadButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn.toolTip')}"
click="onUploadButtonClicked()"
tabIndex="{baseIndex+5}"/>
- <mx:Spacer width="50%" id="spacer1"/>
- <mx:Button id="backButton" visible="false" width="30" height="20" styleName="presentationBackButtonStyle"
+ <mx:Spacer width="100%" id="spacer1"/>
+ <mx:Button id="backButton" visible="false" width="45" height="30" styleName="presentationBackButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.backBtn.toolTip')}" click="gotoPreviousSlide()"
tabIndex="{baseIndex+6}"/>
<mx:Button id="btnSlideNum" visible="false" label="" click="showThumbnails()" doubleClick="showPageDialog()"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.slideNumLbl.toolTip')}"
tabIndex="{baseIndex+7}" accessibilityName="{ResourceUtil.getInstance().getString('bbb.presentation.slideNumberButton')}"/>
- <mx:Button id="forwardButton" visible="false" width="30" height="20" styleName="presentationForwardButtonStyle"
+ <mx:Button id="forwardButton" visible="false" width="45" height="30" styleName="presentationForwardButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="gotoNextSlide()"
tabIndex="{baseIndex+8}"/>
- <mx:Spacer width="10%" id="spacer2"/>
-
+ <mx:Spacer width="50%" id="spacer3"/>
<mx:HSlider id="zoomSlider" visible="false" value="{slideView.zoomPercentage}" styleName="presentationZoomSliderStyle"
minimum="100" maximum="400" dataTipPlacement="top" labels="['100%','400%']"
useHandCursor="true" snapInterval="5" allowTrackClick="true" liveDragging="true"
dataTipFormatFunction="removeDecimalFromDataTip" change="onSliderZoom()" width="100"
tabIndex="{baseIndex+9}" accessibilityName="{ResourceUtil.getInstance().getString('bbb.presentation.slider')}"/>
- <mx:Spacer width="50%" id="spacer3"/>
- <mx:Button id="btnFitToWidth" visible="false" width="25" height="25" styleName="presentationFitToWidthButtonStyle"
+ <mx:Button id="btnFitToWidth" visible="false" width="30" height="30" styleName="presentationFitToWidthButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToWidth.toolTip')}"
click="onFitToPage(false)"
tabIndex="{baseIndex+10}"/>
- <mx:Button id="btnFitToPage" visible="false" width="25" height="25" styleName="presentationFitToPageButtonStyle"
+ <mx:Button id="btnFitToPage" visible="false" width="30" height="30" styleName="presentationFitToPageButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToPage.toolTip')}"
click="onFitToPage(true)"
tabIndex="{baseIndex+11}"/>
- <mx:Spacer width="5" id="spacer4"/>
</mx:ControlBar>
</pres:MDIWindow>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
index 0fdec10e33120a1a99cfb864c0e38cc86d4ef1ca..79b5d07ba7c4ad80749cd46244aca3fca69d21ed 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -60,28 +60,31 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Script>
<![CDATA[
import flash.ui.Keyboard;
- import mx.events.MoveEvent;
- import mx.events.ResizeEvent;
- import mx.managers.CursorManager;
-
- import org.bigbluebutton.common.Images;
- import org.bigbluebutton.common.LogUtil;
- import org.bigbluebutton.core.UsersUtil;
- import org.bigbluebutton.core.managers.UserManager;
- import org.bigbluebutton.main.events.MadePresenterEvent;
- import org.bigbluebutton.main.events.ShortcutEvent;
- import org.bigbluebutton.modules.present.events.PresentationEvent;
- import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
- import org.bigbluebutton.modules.whiteboard.business.shapes.DrawObject;
- import org.bigbluebutton.modules.whiteboard.business.shapes.GraphicObject;
- import org.bigbluebutton.modules.whiteboard.business.shapes.TextObject;
- import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
- import org.bigbluebutton.modules.whiteboard.events.GraphicObjectFocusEvent;
- import org.bigbluebutton.modules.whiteboard.events.StopWhiteboardModuleEvent;
- import org.bigbluebutton.modules.whiteboard.events.ToggleGridEvent;
- import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
- import org.bigbluebutton.modules.whiteboard.events.WhiteboardDrawEvent;
- import org.bigbluebutton.modules.whiteboard.events.WhiteboardPresenterEvent;
+
+ import mx.containers.ControlBar;
+ import mx.events.MoveEvent;
+ import mx.events.ResizeEvent;
+ import mx.managers.CursorManager;
+
+ import org.bigbluebutton.common.Images;
+ import org.bigbluebutton.common.LogUtil;
+ import org.bigbluebutton.core.UsersUtil;
+ import org.bigbluebutton.core.managers.UserManager;
+ import org.bigbluebutton.main.events.MadePresenterEvent;
+ import org.bigbluebutton.main.events.ShortcutEvent;
+ import org.bigbluebutton.modules.present.events.PresentationEvent;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.SlideView;
+ import org.bigbluebutton.modules.whiteboard.business.shapes.DrawObject;
+ import org.bigbluebutton.modules.whiteboard.business.shapes.GraphicObject;
+ import org.bigbluebutton.modules.whiteboard.business.shapes.TextObject;
+ import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
+ import org.bigbluebutton.modules.whiteboard.events.GraphicObjectFocusEvent;
+ import org.bigbluebutton.modules.whiteboard.events.StopWhiteboardModuleEvent;
+ import org.bigbluebutton.modules.whiteboard.events.ToggleGridEvent;
+ import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
+ import org.bigbluebutton.modules.whiteboard.events.WhiteboardDrawEvent;
+ import org.bigbluebutton.modules.whiteboard.events.WhiteboardPresenterEvent;
import org.bigbluebutton.modules.whiteboard.events.WhiteboardSettingResetEvent;
import org.bigbluebutton.modules.whiteboard.views.models.WhiteboardOptions;
import org.bigbluebutton.util.i18n.ResourceUtil;
@@ -220,8 +223,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
//presentationWindow.addEventListener(MoveEvent.MOVE, setPositionAndDepth);
//presentationWindow.addEventListener(ResizeEvent.RESIZE, setPositionAndDepth);
//presentationWindow.addEventListener(MouseEvent.CLICK, setPositionAndDepth);
- presentationWindow.addEventListener(MouseEvent.ROLL_OVER, showToolbar);
- presentationWindow.addEventListener(MouseEvent.ROLL_OUT, hideToolbar);
+
+ window.presCtrlBar.addEventListener(MouseEvent.ROLL_OVER, hideToolbar);
+ window.presCtrlBar.addEventListener(MouseEvent.ROLL_OUT, showToolbar);
+
+ window.addEventListener(MouseEvent.ROLL_OVER, showToolbar);
+ window.addEventListener(MouseEvent.ROLL_OUT, hideToolbar);
+
this.addEventListener(MouseEvent.ROLL_OVER, showToolbar);
this.addEventListener(MouseEvent.ROLL_OUT, hideToolbar);
@@ -239,17 +247,17 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function closeToolbar(e:StopWhiteboardModuleEvent):void {
parent.removeChild(this);
}
-
- private function showToolbar(e:MouseEvent):void {
- if (toolbarAllowed()) {
- setPositionAndDepth();
- showWhiteboardToolbar = true;
- }
- }
-
- private function hideToolbar(e:MouseEvent = null):void {
- showWhiteboardToolbar = false;
- }
+
+ private function showToolbar(e:MouseEvent):void {
+ if (toolbarAllowed()) {
+ setPositionAndDepth();
+ showWhiteboardToolbar = true;
+ }
+ }
+
+ private function hideToolbar(e:MouseEvent = null):void {
+ showWhiteboardToolbar = false;
+ }
private function graphicObjSelected(event:GraphicObjectFocusEvent):void {
var gobj:GraphicObject = event.data;