new multiuser whiteboard icon and fixes for text object

bigbluebutton-client/branding/default/style/css/BBBDefault.css

@@ -231,7 +231,7 @@ DataGrid {
 .whiteboardUndoButtonStyle, .whiteboardCircleButtonStyle, .whiteboardClearButtonStyle,
 .whiteboardTriangleButtonStyle, .whiteboardTextButtonStyle, .whiteboardRectangleButtonStyle,
 .whiteboardPanZoomButtonStyle, .whiteboardLineButtonStyle, .whiteboardScribbleButtonStyle,
-.chatClearButtonStyle
+.chatClearButtonStyle, .multiUserWhiteboardOnButtonStyle, .multiUserWhiteboardOffButtonStyle
 {
   textIndent: 0;
   paddingLeft: 0;
@@ -250,6 +250,16 @@ DataGrid {
   fontSize: 12;
 }
 
+.multiUserWhiteboardOnButtonStyle 
+{
+	icon: Embed('assets/images/multiuserwhiteboardon.png');
+}
+
+.multiUserWhiteboardOffButtonStyle 
+{
+	icon: Embed('assets/images/multiuserwhiteboardoff.png');
+}
+
 .whiteboardUndoButtonStyle 
 {
   icon: Embed('assets/images/undo.png');

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as

@@ -242,10 +242,11 @@ package org.bigbluebutton.modules.whiteboard
                         _annotationsList.push(gobj);
                     }
                 }  
-                
+                /*
                 for (var ij:int = 0; ij < this._annotationsList.length; ij++){
                     redrawGraphic(this._annotationsList[ij] as GraphicObject, ij);
                 }
+				*/
             }
         }
     

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as

@@ -96,10 +96,13 @@ package org.bigbluebutton.modules.whiteboard.business.shapes
 		}
 		
 		public function redraw(parentWidth:Number, parentHeight:Number, zoom:Number):void {
-			_parentWidth = parentWidth;
-			_parentHeight = parentHeight;
-			_zoom = zoom;
-			makeGraphic();
+			// in some cases (like moving the window around) a redraw is called with identical information as previous values
+			if (_parentWidth != parentWidth || _parentHeight != parentHeight || _zoom != zoom) {
+				_parentWidth = parentWidth;
+				_parentHeight = parentHeight;
+				_zoom = zoom;
+				makeGraphic();
+			}
 		}
 		
 		public function updateAnnotation(a:Annotation):void {

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/TextObject.as

@@ -94,6 +94,10 @@ package org.bigbluebutton.modules.whiteboard.business.shapes {
 			_zoom = zoom;
 			_fontSize = _ao.fontSize;
 			
+			if (_status == AnnotationStatus.DRAW_END) {
+				makeEditable(false);
+			}
+			
 			makeGraphic();
 		}
 	
@@ -128,7 +132,7 @@ package org.bigbluebutton.modules.whiteboard.business.shapes {
 			
 			if (!_editable) {
 				text = _ao.text;
-				textColor = _ao.textColor;
+				textColor = _ao.fontColor;
 			}
 		}
 		

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/TextUpdateListener.as

@@ -50,6 +50,9 @@ package org.bigbluebutton.modules.whiteboard.views {
 		}
 		
 		public function newTextObject(tobj:TextObject):void {
+			if (_currentTextObject != null) {
+				canvasMouseDown();
+			}
 			_currentTextObject = tobj;
 			_whiteboardId = _whiteboardModel.getCurrentWhiteboardId();
 			_whiteboardCanvas.textToolbar.syncPropsWith(_currentTextObject);

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

@@ -374,5 +374,5 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				useHandCursor="true" value="2" showDataTip="true" snapInterval="1" dataTipOffset="0" labelOffset="0" 
 				accessibilityName="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.thickness.accessibilityName')}" />
 	<mx:Image source="{thin_icon}" horizontalAlign="center" width="30"/>
-	<mx:Button id="multiUserBtn" click="changeMultiUser()" label="{multiUser ? 'M' : 'P'}" />
+	<mx:Button id="multiUserBtn" click="changeMultiUser()" width="30" height="30" styleName="{multiUser ? 'multiUserWhiteboardOnButtonStyle' : 'multiUserWhiteboardOffButtonStyle'}"/> 
 </mx:VBox>