git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48749 954022d7-b5bf-4e40-9824-e11837661b57

Common/Charts/DrawingObjects.js

@@ -2000,7 +2000,7 @@ function DrawingObjects() {
         return trackOverlay;
     };
 
-    _this.OnUpdateOverlay = function(bFullClear) {
+    _this.OnUpdateOverlay = function() {
         
         var overlay = trackOverlay;
 		var ctx = overlay.m_oContext;
@@ -2008,6 +2008,9 @@ function DrawingObjects() {
 
         overlay.Clear();
         this.drawingDocument.Overlay = overlay;
+		
+		var bFullClear = (_this.controller.curState.id != STATES_ID_TEXT_ADD) && (_this.controller.curState.id != STATES_ID_TEXT_ADD_IN_GROUP);
+		//console.log("bFullClear - " + bFullClear);
 
 		if ( bFullClear )
 			shapeOverlayCtx.m_oContext.clearRect(0, 0, shapeOverlayCtx.m_lWidthPix, shapeOverlayCtx.m_lHeightPix);
@@ -2297,15 +2300,6 @@ function DrawingObjects() {
 		_this.drawWorksheetHeaders();
 	}
 
-	_this.showOverlayGraphicObjects = function() {
-		shapeOverlayCtx.put_GlobalAlpha(true, 0.5);
-		shapeOverlayCtx.m_oContext.clearRect(0, 0, shapeOverlayCtx.m_lWidthPix, shapeOverlayCtx.m_lHeightPix);
-		worksheet._drawGraphic();
-		_this.controller.drawTracks(shapeOverlayCtx);
-		shapeOverlayCtx.put_GlobalAlpha(true, 1);
-		_this.drawWorksheetHeaders();
-	}
-	
 	_this.getDrawingAreaMetrics = function() {
 
 		/*

Excel/model/DrawingObjects/States.js

@@ -156,6 +156,7 @@ function NullState(drawingObjectsController, drawingObjects)
                     }
                     else if(hit_in_text_rect)
                     {
+						cur_drawing.select(this.drawingObjectsController);
                         cur_drawing.selectionSetStart(e, x, y);
                         this.drawingObjectsController.changeCurrentState(new TextAddState(this.drawingObjectsController, this.drawingObjects, cur_drawing));
                         if(e.ClickCount < 2)
@@ -1781,7 +1782,7 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
     {
         var resize_coefficients = this.majorObject.getResizeCoefficients(this.handleNum, x, y);
         this.drawingObjectsController.trackResizeObjects(resize_coefficients.kd1, resize_coefficients.kd2, e);
-        this.drawingObjects.OnUpdateOverlay(true);
+        this.drawingObjects.OnUpdateOverlay();
 
     };
 
@@ -2037,7 +2038,7 @@ function TrackNewShapeState(drawingObjectsController, drawingObjects, presetGeom
     this.onMouseMove = function(e, x, y)
     {
         this.drawingObjectsController.trackNewShape(e, x, y);
-        this.drawingObjects.OnUpdateOverlay(true);
+        this.drawingObjects.OnUpdateOverlay();
     };
 
     this.onMouseUp = function(e, x, y)
@@ -2282,7 +2283,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
         var dy = y - this.startY;
         var check_position = this.drawingObjects.checkGraphicObjectPosition(this.rectX + dx, this.rectY + dy, this.rectW, this.rectH);
         this.drawingObjectsController.trackMoveObjects(dx + check_position.x, dy + check_position.y);
-        this.drawingObjects.OnUpdateOverlay(true);
+        this.drawingObjects.OnUpdateOverlay();
     };
 
     this.onMouseUp = function(e, x, y)