Commit 7f33db15 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 25605 - Автофигура вставляется в левый верхний угол при открытии контекстного меню (edit)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57437 954022d7-b5bf-4e40-9824-e11837661b57
parent 90513cc9
......@@ -4551,7 +4551,7 @@ DrawingObjectsController.prototype =
if(image_props.h != null && image_props.h !== group_drawing_props.imageProps.h)
image_props.h = null;
if(image_props.locked || new_image_props.locked)
if(image_props.locked || group_drawing_props.imageProps.locked)
image_props.locked = true;
}
}
......@@ -4578,7 +4578,7 @@ DrawingObjectsController.prototype =
if(chart_props.h != null && chart_props.h !== group_drawing_props.chartProps.h)
chart_props.h = null;
if(chart_props.locked || new_chart_props.locked)
if(chart_props.locked || group_drawing_props.chartProps.locked)
chart_props.locked = true;
}
}
......
......@@ -7141,7 +7141,10 @@ CChartSpace.prototype =
graphics.AddClipRect(-ln_width, -ln_width, this.extX+2*ln_width, this.extY+2*ln_width);
this.chartObj.draw(this, graphics);
if(this.chartObj)
{
this.chartObj.draw(this, graphics);
}
// graphics.reset();
......
......@@ -50,6 +50,30 @@ StartAddNewShape.prototype =
this.drawingObjects.drawingObjects.objectLocker.addObjectId("1");
var oThis = this;
var track = oThis.drawingObjects.arrTrackObjects[0];
if(!this.bMoved && this instanceof StartAddNewShape)
{
var ext_x, ext_y;
if(typeof SHAPE_ASPECTS[this.preset] === "number")
{
var _aspect = SHAPE_ASPECTS[this.preset];
if(_aspect >= 1)
{
ext_y = 25.4;
ext_x = ext_y*_aspect;
}
else
{
ext_x = 25.4;
ext_y = ext_x/_aspect;
}
}
else
{
ext_x = 25.4;
ext_y = 25.4;
}
this.onMouseMove({IsLocked: true}, this.startX + ext_x, this.startY + ext_y);
}
this.drawingObjects.drawingObjects.objectLocker.checkObjects(function(bLock){
if(bLock)
......
......@@ -63,9 +63,9 @@ StartAddNewShape.prototype =
if(!this.bMoved && this instanceof StartAddNewShape)
{
var ext_x, ext_y;
if(typeof SHAPE_ASPECTS[this.presetGeom] === "number")
if(typeof SHAPE_ASPECTS[this.preset] === "number")
{
var _aspect = SHAPE_ASPECTS[this.drawingObjects.currentPresetGeom];
var _aspect = SHAPE_ASPECTS[this.preset];
if(_aspect >= 1)
{
ext_y = 25.4;
......
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