Skip to content

S
sdkjs
Commit 595e12a8 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov
Browse files
Options

Переделана схема с переносом "плавающих" объектов (баг 21557). 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51123 954022d7-b5bf-4e40-9824-e11837661b57
parent a5d34de1
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 64 deletions
Word/Editor/Paragraph.js
View file @ 595e12a8
......@@ -1632,8 +1632,6 @@ Paragraph.prototype =
}
}
this.Internal_Content_Add( StartPos, new ParaPageBreakRenderer() );
this.Pages[CurPage].Set_EndLine( -1 );
if ( 0 === CurLine )
{
......@@ -1648,8 +1646,6 @@ Paragraph.prototype =
{
if ( CurLine != this.Pages[CurPage].FirstLine )
{
this.Internal_Content_Add( LineStart_Pos, new ParaPageBreakRenderer() );
this.Pages[CurPage].Set_EndLine( CurLine - 1 );
if ( 0 === CurLine )
{
......@@ -3200,7 +3196,7 @@ Paragraph.prototype =
if ( true === Item.Is_Inline() || true === this.Parent.Is_DrawingShape() )
{
Item.Update_Position( X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y, PageLimits );
Item.Update_Position( new CParagraphLayout(X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y), PageLimits );
Item.Reset_SavedPosition();
bFirstLineItem = false;
......@@ -3222,7 +3218,7 @@ Paragraph.prototype =
if ( true === LDRecalcInfo.Can_RecalcObject() )
{
// Обновляем позицию объекта
Item.Update_Position( X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y, PageLimits);
Item.Update_Position( new CParagraphLayout(X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y), PageLimits);
LDRecalcInfo.Set_FlowObject( Item, 0, recalcresult_NextElement );
return recalcresult_CurPage;
}
......@@ -3246,7 +3242,7 @@ Paragraph.prototype =
// мы не персчитываем заново текущую страницу, а не предыдущую
// Обновляем позицию объекта
Item.Update_Position( X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y, PageLimits);
Item.Update_Position( new CParagraphLayout(X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y), PageLimits);
LDRecalcInfo.Set_FlowObject( Item, 0, recalcresult_NextElement );
LDRecalcInfo.Set_PageBreakBefore( false );
......@@ -3269,7 +3265,7 @@ Paragraph.prototype =
else
{
// Картинка ложится на или под текст, в данном случае пересчет можно спокойно продолжать
Item.Update_Position( X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y, PageLimits);
Item.Update_Position( new CParagraphLayout(X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y), PageLimits);
Item.Reset_SavedPosition();
continue;
}
......@@ -10018,6 +10014,89 @@ Paragraph.prototype =
return Result;
},
Get_Layout : function(ContentPos, Drawing)
{
var LinePos = this.Internal_Get_ParaPos_By_Pos( ContentPos );
var CurLine = LinePos.Line;
var CurRange = LinePos.Range;
var CurPage = LinePos.Page;
var X = this.Lines[CurLine].Ranges[CurRange].XVisible;
var Y = this.Pages[CurPage].Y + this.Lines[CurLine].Y;
var StartPos = this.Lines[CurLine].Ranges[CurRange].StartPos;
if ( StartPos < this.Numbering.Pos )
X += this.Numbering.WidthVisible;
var LastW = 0;
for ( var ItemNum = StartPos; ItemNum < this.Content.length; ItemNum++ )
{
var Item = this.Content[ItemNum];
if ( ItemNum === ContentPos )
{
var DrawingObjects = this.Parent.DrawingObjects;
var PageLimits = this.Parent.Get_PageLimits(this.PageNum + CurPage);
var PageFields = this.Parent.Get_PageFields(this.PageNum + CurPage);
var ColumnStartX = (0 === CurPage ? this.X_ColumnStart : this.Pages[CurPage].X);
var ColumnEndX = (0 === CurPage ? this.X_ColumnEnd : this.Pages[CurPage].XLimit);
var Top_Margin = Y_Top_Margin;
var Bottom_Margin = Y_Bottom_Margin;
var Page_H = Page_Height;
if ( true === this.Parent.Is_TableCellContent() && undefined != Drawing && true == Drawing.Use_TextWrap() )
{
Top_Margin = 0;
Bottom_Margin = 0;
Page_H = 0;
}
if ( undefined != Drawing && true != Drawing.Use_TextWrap() )
{
PageFields.X = X_Left_Field;
PageFields.Y = Y_Top_Field;
PageFields.XLimit = X_Right_Field;
PageFields.YLimit = Y_Bottom_Field;
PageLimits.X = 0;
PageLimits.Y = 0;
PageLimits.XLimit = Page_Width;
PageLimits.YLimit = Page_Height;
}
return { ParagraphLayout : new CParagraphLayout( X, Y , this.Get_StartPage_Absolute() + CurPage, LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y ), PageLimits : PageLimits };
}
switch ( Item.Type )
{
case para_Text:
case para_Space:
case para_PageNum:
{
LastW = Item.WidthVisible;
break;
}
case para_Drawing:
{
if ( true === Item.Is_Inline() || true === this.Parent.Is_DrawingShape() )
{
LastW = Item.WidthVisible;
}
break;
}
}
X += Item.WidthVisible;
}
return undefined;
},
Get_AnchorPos : function(Drawing)
{
// Ищем, где находится наш объект
......
Word/Editor/ParagraphContent.js
View file @ 595e12a8
......@@ -2626,6 +2626,26 @@ ParaTab.prototype =
var drawing_Inline = 0x01;
var drawing_Anchor = 0x02;
function CParagraphLayout(X, Y, PageNum, LastItemW, ColumnStartX, ColumnEndX, Left_Margin, Right_Margin, Page_W, Top_Margin, Bottom_Margin, Page_H, MarginH, MarginV, LineTop, ParagraphTop)
{
this.X = X;
this.Y = Y;
this.PageNum = PageNum;
this.LastItemW = LastItemW;
this.ColumnStartX = ColumnStartX;
this.ColumnEndX = ColumnEndX;
this.Left_Margin = Left_Margin;
this.Right_Margin = Right_Margin;
this.Page_W = Page_W;
this.Top_Margin = Top_Margin;
this.Bottom_Margin = Bottom_Margin;
this.Page_H = Page_H;
this.Margin_H = MarginH;
this.Margin_V = MarginV;
this.LineTop = LineTop;
this.ParagraphTop = ParagraphTop;
}
function CAnchorPosition()
{
// Рассчитанные координаты
......@@ -2658,29 +2678,29 @@ function CAnchorPosition()
CAnchorPosition.prototype =
{
Set : function(W, H, YOffset, X, Y, PageNum, LastItemW, ColumnStartX, ColumnEndX, Left_Margin, Right_Margin, Page_W, Top_Margin, Bottom_Margin, Page_H, MarginH, MarginV, LineTop, ParagraphTop)
Set : function(W, H, YOffset, ParaLayout)
{
this.W = W;
this.H = H;
this.YOffset = YOffset;
this.X = X;
this.Y = Y;
this.PageNum = PageNum;
this.LastItemW = LastItemW;
this.ColumnStartX = ColumnStartX;
this.ColumnEndX = ColumnEndX;
this.Left_Margin = Left_Margin;
this.Right_Margin = Right_Margin;
this.Page_W = Page_W;
this.Top_Margin = Top_Margin;
this.Bottom_Margin = Bottom_Margin;
this.Page_H = Page_H;
this.Margin_H = MarginH;
this.Margin_V = MarginV;
this.LineTop = LineTop;
this.ParagraphTop = ParagraphTop;
this.X = ParaLayout.X;
this.Y = ParaLayout.Y;
this.PageNum = ParaLayout.PageNum;
this.LastItemW = ParaLayout.LastItemW;
this.ColumnStartX = ParaLayout.ColumnStartX;
this.ColumnEndX = ParaLayout.ColumnEndX;
this.Left_Margin = ParaLayout.Left_Margin;
this.Right_Margin = ParaLayout.Right_Margin;
this.Page_W = ParaLayout.Page_W;
this.Top_Margin = ParaLayout.Top_Margin;
this.Bottom_Margin = ParaLayout.Bottom_Margin;
this.Page_H = ParaLayout.Page_H;
this.Margin_H = ParaLayout.Margin_H;
this.Margin_V = ParaLayout.Margin_V;
this.LineTop = ParaLayout.LineTop;
this.ParagraphTop = ParaLayout.ParagraphTop;
},
Calculate_X : function(bInline, RelativeFrom, bAlign, Value)
......@@ -3899,7 +3919,8 @@ ParaDrawing.prototype =
return this.GraphicObj.Selection_Is_TableBorderMove();
return false;
},
Update_Position : function(X, Y, PageNum, LastItemW, ColumnStartX, ColumnEndX, Left_Margin, Right_Margin, Page_W, Top_Margin, Bottom_Margin, Page_H, MarginH, MarginV, LineTop, ParagraphTop, PageLimits)
Update_Position : function(ParaLayout, PageLimits)
{
if ( undefined != this.PositionH_Old )
{
......@@ -3917,6 +3938,8 @@ ParaDrawing.prototype =
this.DocumentContent = this.Parent.Parent;
var PageNum = ParaLayout.PageNum;
var OtherFlowObjects = this.mainGraphicObjects.getAllFloatObjectsOnPage( PageNum, this.Parent.Parent );
var bInline = ( drawing_Inline === this.DrawingType ? true : false );
......@@ -3940,7 +3963,7 @@ ParaDrawing.prototype =
}
this.Internal_Position.Set( W, H, this.YOffset, X, Y, PageNum, LastItemW, ColumnStartX, ColumnEndX, Left_Margin, Right_Margin, Page_W, Top_Margin, Bottom_Margin, Page_H, MarginH, MarginV, LineTop, ParagraphTop);
this.Internal_Position.Set( W, H, this.YOffset, ParaLayout);
this.Internal_Position.Calculate_X(bInline, this.PositionH.RelativeFrom, this.PositionH.Align, this.PositionH.Value);
this.Internal_Position.Calculate_Y(bInline, this.PositionV.RelativeFrom, this.PositionV.Align, this.PositionV.Value);
this.Internal_Position.Correct_Values(bInline, PageLimits, this.AllowOverlap, this.Use_TextWrap(), OtherFlowObjects);
......@@ -4257,8 +4280,40 @@ ParaDrawing.prototype =
return false;
},
Set_XYForAdd : function(X, Y)
Set_XYForAdd : function(X, Y, NearPos, PageNum)
{
if ( null !== NearPos )
{
var Layout = NearPos.Paragraph.Get_Layout( NearPos.ContentPos, this );
var _W = (this.PositionH.Align ? this.W : this.getXfrmExtX() );
var _H = (this.PositionV.Align ? this.H : this.getXfrmExtY() );
this.Internal_Position.Set( _W, _H, this.YOffset, Layout.ParagraphLayout );
this.Internal_Position.Calculate_X(false, c_oAscRelativeFromH.Page, false, X);
this.Internal_Position.Calculate_Y(false, c_oAscRelativeFromV.Page, false, Y);
this.Internal_Position.Correct_Values(false, Layout.PageLimits, this.AllowOverlap, this.Use_TextWrap(), []);
this.PageNum = PageNum;
this.X = this.Internal_Position.CalcX;
this.Y = this.Internal_Position.CalcY;
// Рассчитаем сдвиг с учетом старой привязки
var ValueX = this.Internal_Position.Calculate_X_Value(this.PositionH.RelativeFrom);
this.Set_PositionH( this.PositionH.RelativeFrom, false, ValueX );
// На всякий случай пересчитаем заново координату
this.X = this.Internal_Position.Calculate_X(false, this.PositionH.RelativeFrom, this.PositionH.Align, this.PositionH.Value);
// Рассчитаем сдвиг с учетом старой привязки
var ValueY = this.Internal_Position.Calculate_Y_Value(this.PositionV.RelativeFrom);
this.Set_PositionV( this.PositionV.RelativeFrom, false, ValueY );
// На всякий случай пересчитаем заново координату
this.Y = this.Internal_Position.Calculate_Y(false, this.PositionV.RelativeFrom, this.PositionV.Align, this.PositionV.Value);
}
/*
this.Set_PositionH( c_oAscRelativeFromH.Column, false, 0 );
this.Set_PositionV( c_oAscRelativeFromV.Paragraph, false, 0 );
......@@ -4291,6 +4346,7 @@ ParaDrawing.prototype =
this.PositionV.RelativeFrom = c_oAscRelativeFromV.Page;
this.PositionV.Align = false;
this.PositionV.Value = Y;
*/
},
Get_DrawingType : function()
......@@ -4355,51 +4411,41 @@ ParaDrawing.prototype =
OnEnd_ChangeFlow : function(X, Y, PageNum, W, H, NearPos, bMove, bLast)
{
var LogicDocument = editor.WordControl.m_oLogicDocument;
if ( true === bMove )
this.Update_Size( W, H );
if ( true === bMove && null !== NearPos )
{
// Здесь мы должны для первого рассчета оставить привязку относительно страницы, а после рассчета
// изменить привязку на старую, при этом пересчитав координаты так, чтобы картинка не изменила
// своего положения.
var Layout = NearPos.Paragraph.Get_Layout( NearPos.ContentPos, this );
this.PositionH_Old =
{
RelativeFrom : this.PositionH.RelativeFrom,
Align : this.PositionH.Align,
Value : this.PositionH.Value,
var _W = (this.PositionH.Align ? this.W : this.getXfrmExtX() );
var _H = (this.PositionV.Align ? this.H : this.getXfrmExtY() );
RelativeFrom2 : c_oAscRelativeFromH.Page,
Align2 : false,
Value2 : X
};
this.Internal_Position.Set( _W, _H, this.YOffset, Layout.ParagraphLayout );
this.Internal_Position.Calculate_X(false, c_oAscRelativeFromH.Page, false, X);
this.Internal_Position.Calculate_Y(false, c_oAscRelativeFromV.Page, false, Y);
this.Internal_Position.Correct_Values(false, Layout.PageLimits, this.AllowOverlap, this.Use_TextWrap(), []);
this.PositionV_Old =
{
RelativeFrom : this.PositionV.RelativeFrom,
Align : this.PositionV.Align,
Value : this.PositionV.Value,
this.PageNum = PageNum;
this.X = this.Internal_Position.CalcX;
this.Y = this.Internal_Position.CalcY;
RelativeFrom2 : c_oAscRelativeFromV.Page,
Align2 : false,
Value2 : Y
};
// Рассчитаем сдвиг с учетом старой привязки
var ValueX = this.Internal_Position.Calculate_X_Value(this.PositionH.RelativeFrom);
this.Set_PositionH( this.PositionH.RelativeFrom, false, ValueX );
this.PositionH.RelativeFrom = c_oAscRelativeFromH.Page;
this.PositionH.Align = false;
this.PositionH.Value = X;
// На всякий случай пересчитаем заново координату
this.X = this.Internal_Position.Calculate_X(false, this.PositionH.RelativeFrom, this.PositionH.Align, this.PositionH.Value);
this.PositionV.RelativeFrom = c_oAscRelativeFromV.Page;
this.PositionV.Align = false;
this.PositionV.Value = Y;
// Рассчитаем сдвиг с учетом старой привязки
var ValueY = this.Internal_Position.Calculate_Y_Value(this.PositionV.RelativeFrom);
this.Set_PositionV( this.PositionV.RelativeFrom, false, ValueY );
if ( null !== NearPos )
{
this.Remove_FromDocument( false );
this.Add_ToDocument( NearPos, false );
}
}
// На всякий случай пересчитаем заново координату
this.Y = this.Internal_Position.Calculate_Y(false, this.PositionV.RelativeFrom, this.PositionV.Align, this.PositionV.Value);
this.Update_Size( W, H );
this.Remove_FromDocument( false );
this.Add_ToDocument( NearPos, false );
}
if ( true === bLast )
editor.WordControl.m_oLogicDocument.Recalculate();
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7