Commit 3fea5909 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Полная очистка оверлея только при Move State, в остальных выборочно

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48748 954022d7-b5bf-4e40-9824-e11837661b57
parent 9b50fe53
This diff is collapsed.
...@@ -1781,7 +1781,7 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card ...@@ -1781,7 +1781,7 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
{ {
var resize_coefficients = this.majorObject.getResizeCoefficients(this.handleNum, x, y); var resize_coefficients = this.majorObject.getResizeCoefficients(this.handleNum, x, y);
this.drawingObjectsController.trackResizeObjects(resize_coefficients.kd1, resize_coefficients.kd2, e); this.drawingObjectsController.trackResizeObjects(resize_coefficients.kd1, resize_coefficients.kd2, e);
this.drawingObjects.OnUpdateOverlay(); this.drawingObjects.OnUpdateOverlay(true);
}; };
...@@ -2037,7 +2037,7 @@ function TrackNewShapeState(drawingObjectsController, drawingObjects, presetGeom ...@@ -2037,7 +2037,7 @@ function TrackNewShapeState(drawingObjectsController, drawingObjects, presetGeom
this.onMouseMove = function(e, x, y) this.onMouseMove = function(e, x, y)
{ {
this.drawingObjectsController.trackNewShape(e, x, y); this.drawingObjectsController.trackNewShape(e, x, y);
this.drawingObjects.OnUpdateOverlay(); this.drawingObjects.OnUpdateOverlay(true);
}; };
this.onMouseUp = function(e, x, y) this.onMouseUp = function(e, x, y)
...@@ -2282,7 +2282,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec ...@@ -2282,7 +2282,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
var dy = y - this.startY; var dy = y - this.startY;
var check_position = this.drawingObjects.checkGraphicObjectPosition(this.rectX + dx, this.rectY + dy, this.rectW, this.rectH); 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.drawingObjectsController.trackMoveObjects(dx + check_position.x, dy + check_position.y);
this.drawingObjects.OnUpdateOverlay(); this.drawingObjects.OnUpdateOverlay(true);
}; };
this.onMouseUp = function(e, x, y) this.onMouseUp = function(e, x, y)
......
...@@ -2547,7 +2547,7 @@ ...@@ -2547,7 +2547,7 @@
var zoom = ws.getZoom(); var zoom = ws.getZoom();
var x1 = x1/zoom; var x1 = x1/zoom;
var y1 = y1/zoom; var y1 = y1/zoom;
ws.drawingCtx ws.overlayCtx
.setFillStyle(ws.settings.cells.defaultState.background) .setFillStyle(ws.settings.cells.defaultState.background)
.setLineWidth(1) .setLineWidth(1)
.setStrokeStyle(ws.settings.cells.defaultState.border) .setStrokeStyle(ws.settings.cells.defaultState.border)
...@@ -2564,7 +2564,7 @@ ...@@ -2564,7 +2564,7 @@
{ {
var shift = 0.5; var shift = 0.5;
var size = 4*index; var size = 4*index;
ws.drawingCtx ws.overlayCtx
.beginPath() .beginPath()
.moveTo(x, y, 0, 0) .moveTo(x, y, 0, 0)
.lineTo(x,y - size/2, 0, 0) .lineTo(x,y - size/2, 0, 0)
...@@ -2580,7 +2580,7 @@ ...@@ -2580,7 +2580,7 @@
{ {
var size = 4*index; var size = 4*index;
var shift = 0.5; var shift = 0.5;
ws.drawingCtx ws.overlayCtx
.beginPath() .beginPath()
.moveTo(x , y , -shift, 0) .moveTo(x , y , -shift, 0)
.lineTo(x + size,y, -shift,0.5) .lineTo(x + size,y, -shift,0.5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment