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

поправлен баг с пересчетом позиции после изменений в группе у которой Align стоит в true

поправлен баг с неправильным определением попадания в группу, если она выделена на другой странице

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66070 954022d7-b5bf-4e40-9824-e11837661b57
parent 08fce83d
...@@ -218,6 +218,8 @@ NullState.prototype = ...@@ -218,6 +218,8 @@ NullState.prototype =
} }
return ret; return ret;
} }
if(selection.groupSelection.selectStartPage === pageIndex){
ret = handleFloatObjects(this.drawingObjects, selection.groupSelection.arrGraphicObjects, e, x, y, selection.groupSelection, pageIndex, true); ret = handleFloatObjects(this.drawingObjects, selection.groupSelection.arrGraphicObjects, e, x, y, selection.groupSelection, pageIndex, true);
if(ret) if(ret)
{ {
...@@ -235,6 +237,7 @@ NullState.prototype = ...@@ -235,6 +237,7 @@ NullState.prototype =
return ret; return ret;
} }
} }
}
else if(selection.chartSelection) else if(selection.chartSelection)
{} {}
...@@ -1120,19 +1123,8 @@ MoveInGroupState.prototype = ...@@ -1120,19 +1123,8 @@ MoveInGroupState.prototype =
} }
else else
{ {
// var nearest_pos = this.drawingObjects.document.Get_NearestPos(this.group.parent.pageIndex, this.group.parent.X + (bounds.x - old_x), this.group.parent.Y + (bounds.y - old_y), true, this.group.parent); this.group.parent.CheckWH();
// if(nearest_pos.Paragraph !== check_paragraphs[0] && this.group.parent.Locked !== true )
// {
// check_paragraphs.push(nearest_pos.Paragraph);
// this.group.parent.Remove_FromDocument(false);
// nearest_pos.Paragraph.Check_NearestPos(nearest_pos);
// this.group.parent.Set_XYForAdd(this.group.posX + posX, this.group.posY + posY, nearest_pos, this.group.parent.pageIndex);
// this.group.parent.Add_ToDocument(nearest_pos, false);
// }
// else
{
this.group.parent.Set_XY(this.group.posX + posX, this.group.posY + posY, check_paragraphs[0], this.group.parent.pageIndex, false); this.group.parent.Set_XY(this.group.posX + posX, this.group.posY + posY, check_paragraphs[0], this.group.parent.pageIndex, false);
}
check_paragraphs.length = 0; check_paragraphs.length = 0;
} }
if(false === editor.isViewMode && false === this.drawingObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_ElementsArray_and_Type , Elements : check_paragraphs, CheckType : changestype_Paragraph_Content})) if(false === editor.isViewMode && false === this.drawingObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_ElementsArray_and_Type , Elements : check_paragraphs, CheckType : changestype_Paragraph_Content}))
......
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