Skip to content

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

Исправлен баг с отрисовкой границ параграфа, который обтекает автофигуру.... 

Исправлен баг с отрисовкой границ параграфа, который обтекает автофигуру. Реализован параметр "Space" у границ параграфа. Доработан тестовый приемер: добавлена возможность менять "Space" у границ параграфа.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47491 954022d7-b5bf-4e40-9824-e11837661b57
parent de3f881b
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 69 deletions
Word/Editor/Paragraph.js
View file @ 06cc9fa8
...@@ -1841,9 +1841,9 @@ Paragraph.prototype = ...@@ -1841,9 +1841,9 @@ Paragraph.prototype =
if ( 0 === this.Pages[CurPage].FirstLine ) if ( 0 === this.Pages[CurPage].FirstLine )
{ {
if ( ( true === ParaPr.Brd.First || 1 === CurPage ) && border_Single === ParaPr.Brd.Top.Value ) if ( ( true === ParaPr.Brd.First || 1 === CurPage ) && border_Single === ParaPr.Brd.Top.Value )
TempDy += ParaPr.Brd.Top.Size; TempDy += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value ) else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value )
TempDy += ParaPr.Brd.Between.Size; TempDy += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
} }
var Top, Bottom; var Top, Bottom;
...@@ -1866,15 +1866,15 @@ Paragraph.prototype = ...@@ -1866,15 +1866,15 @@ Paragraph.prototype =
Bottom = Top + ParaPr.Spacing.Before + this.Lines[0].Metrics.Ascent + this.Lines[0].Metrics.Descent + this.Lines[0].Metrics.LineGap; Bottom = Top + ParaPr.Spacing.Before + this.Lines[0].Metrics.Ascent + this.Lines[0].Metrics.Descent + this.Lines[0].Metrics.LineGap;
if ( true === ParaPr.Brd.First && border_Single === ParaPr.Brd.Top.Value ) if ( true === ParaPr.Brd.First && border_Single === ParaPr.Brd.Top.Value )
{ {
Top2 += ParaPr.Brd.Top.Size; Top2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom2 += ParaPr.Brd.Top.Size; Bottom2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom += ParaPr.Brd.Top.Size; Bottom += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
} }
else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value ) else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value )
{ {
Top2 += ParaPr.Brd.Between.Size; Top2 += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
Bottom2 += ParaPr.Brd.Between.Size; Bottom2 += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
Bottom += ParaPr.Brd.Between.Size; Bottom += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
} }
} }
else else
...@@ -1885,9 +1885,9 @@ Paragraph.prototype = ...@@ -1885,9 +1885,9 @@ Paragraph.prototype =
if ( border_Single === ParaPr.Brd.Top.Value ) if ( border_Single === ParaPr.Brd.Top.Value )
{ {
Top2 += ParaPr.Brd.Top.Size; Top2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom2 += ParaPr.Brd.Top.Size; Bottom2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom += ParaPr.Brd.Top.Size; Bottom += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
} }
} }
} }
...@@ -1902,8 +1902,16 @@ Paragraph.prototype = ...@@ -1902,8 +1902,16 @@ Paragraph.prototype =
Bottom += ParaPr.Spacing.After; Bottom += ParaPr.Spacing.After;
// Если нижняя граница Between, тогда она учитывается в следующем параграфе // Если нижняя граница Between, тогда она учитывается в следующем параграфе
if ( true === ParaPr.Brd.Last && border_Single === ParaPr.Brd.Bottom.Value ) if ( true === ParaPr.Brd.Last )
Bottom += ParaPr.Brd.Bottom.Size; {
if ( border_Single === ParaPr.Brd.Bottom.Value )
Bottom += ParaPr.Brd.Bottom.Size + ParaPr.Brd.Bottom.Space;
}
else
{
if ( border_Single === ParaPr.Brd.Between.Value )
Bottom += ParaPr.Brd.Between.Space;
}
if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After ) if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After )
Bottom = this.YLimit; Bottom = this.YLimit;
...@@ -1932,8 +1940,16 @@ Paragraph.prototype = ...@@ -1932,8 +1940,16 @@ Paragraph.prototype =
Bottom += ParaPr.Spacing.After; Bottom += ParaPr.Spacing.After;
// Если нижняя граница Between, тогда она учитывается в следующем параграфе // Если нижняя граница Between, тогда она учитывается в следующем параграфе
if ( true === ParaPr.Brd.Last && border_Single === ParaPr.Brd.Bottom.Value ) if ( true === ParaPr.Brd.Last )
Bottom += ParaPr.Brd.Bottom.Size; {
if ( border_Single === ParaPr.Brd.Bottom.Value )
Bottom += ParaPr.Brd.Bottom.Size + ParaPr.Brd.Bottom.Space;
}
else
{
if ( border_Single === ParaPr.Brd.Between.Value )
Bottom += ParaPr.Brd.Between.Space;
}
if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After ) if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After )
Bottom = this.YLimit; Bottom = this.YLimit;
...@@ -1958,8 +1974,16 @@ Paragraph.prototype = ...@@ -1958,8 +1974,16 @@ Paragraph.prototype =
Bottom += ParaPr.Spacing.After; Bottom += ParaPr.Spacing.After;
// Если нижняя граница Between, тогда она учитывается в следующем параграфе // Если нижняя граница Between, тогда она учитывается в следующем параграфе
if ( true === ParaPr.Brd.Last && border_Single === ParaPr.Brd.Bottom.Value ) if ( true === ParaPr.Brd.Last )
Bottom += ParaPr.Brd.Bottom.Size; {
if ( border_Single === ParaPr.Brd.Bottom.Value )
Bottom += ParaPr.Brd.Bottom.Size + ParaPr.Brd.Bottom.Space;
}
else
{
if ( border_Single === ParaPr.Brd.Between.Value )
Bottom += ParaPr.Brd.Between.Space;
}
if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After ) if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After )
Bottom = this.YLimit; Bottom = this.YLimit;
...@@ -1986,15 +2010,15 @@ Paragraph.prototype = ...@@ -1986,15 +2010,15 @@ Paragraph.prototype =
if ( true === ParaPr.Brd.First && border_Single === ParaPr.Brd.Top.Value ) if ( true === ParaPr.Brd.First && border_Single === ParaPr.Brd.Top.Value )
{ {
Top2 += ParaPr.Brd.Top.Size; Top2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom2 += ParaPr.Brd.Top.Size; Bottom2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom += ParaPr.Brd.Top.Size; Bottom += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
} }
else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value ) else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value )
{ {
Top2 += ParaPr.Brd.Between.Size; Top2 += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
Bottom2 += ParaPr.Brd.Between.Size; Bottom2 += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
Bottom += ParaPr.Brd.Between.Size; Bottom += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
} }
} }
else else
...@@ -2005,9 +2029,9 @@ Paragraph.prototype = ...@@ -2005,9 +2029,9 @@ Paragraph.prototype =
if ( border_Single === ParaPr.Brd.Top.Value ) if ( border_Single === ParaPr.Brd.Top.Value )
{ {
Top2 += ParaPr.Brd.Top.Size; Top2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom2 += ParaPr.Brd.Top.Size; Bottom2 += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
Bottom += ParaPr.Brd.Top.Size; Bottom += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
} }
} }
...@@ -2016,8 +2040,16 @@ Paragraph.prototype = ...@@ -2016,8 +2040,16 @@ Paragraph.prototype =
Bottom += ParaPr.Spacing.After; Bottom += ParaPr.Spacing.After;
// Если нижняя граница Between, тогда она учитывается в следующем параграфе // Если нижняя граница Between, тогда она учитывается в следующем параграфе
if ( true === ParaPr.Brd.Last && border_Single === ParaPr.Brd.Bottom.Value ) if ( true === ParaPr.Brd.Last )
Bottom += ParaPr.Brd.Bottom.Size; {
if ( border_Single === ParaPr.Brd.Bottom.Value )
Bottom += ParaPr.Brd.Bottom.Size + ParaPr.Brd.Bottom.Space;
}
else
{
if ( border_Single === ParaPr.Brd.Between.Value )
Bottom += ParaPr.Brd.Between.Space;
}
if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After ) if ( false === this.Parent.Is_TableCellContent() && Bottom > this.YLimit && Bottom - this.YLimit <= ParaPr.Spacing.After )
Bottom = this.YLimit; Bottom = this.YLimit;
...@@ -2484,9 +2516,9 @@ Paragraph.prototype = ...@@ -2484,9 +2516,9 @@ Paragraph.prototype =
if ( 0 === StartLine ) if ( 0 === StartLine )
{ {
if ( ( true === ParaPr.Brd.First || 1 === CurPage ) && border_Single === ParaPr.Brd.Top.Value ) if ( ( true === ParaPr.Brd.First || 1 === CurPage ) && border_Single === ParaPr.Brd.Top.Value )
TempDy += ParaPr.Brd.Top.Size; TempDy += ParaPr.Brd.Top.Size + ParaPr.Brd.Top.Space;
else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value ) else if ( false === ParaPr.Brd.First && border_Single === ParaPr.Brd.Between.Value )
TempDy += ParaPr.Brd.Between.Size; TempDy += ParaPr.Brd.Between.Size + ParaPr.Brd.Between.Space;
} }
for ( var Index = StartLine; Index <= EndLine; Index++ ) for ( var Index = StartLine; Index <= EndLine; Index++ )
...@@ -3284,7 +3316,7 @@ Paragraph.prototype = ...@@ -3284,7 +3316,7 @@ Paragraph.prototype =
// 2 часть отрисовки : // 2 часть отрисовки :
// Добавляем специальный символ слева от параграфа, для параграфов, у которых стоит хотя бы // Добавляем специальный символ слева от параграфа, для параграфов, у которых стоит хотя бы
// одна из настроек: не рарзывать абзац(KeepLines), не отрывать от следующего(KeepNext), // одна из настроек: не разрывать абзац(KeepLines), не отрывать от следующего(KeepNext),
// начать с новой страницы(PageBreakBefore) // начать с новой страницы(PageBreakBefore)
this.Internal_Draw_2( CurPage, pGraphics, Pr ); this.Internal_Draw_2( CurPage, pGraphics, Pr );
...@@ -3571,7 +3603,7 @@ Paragraph.prototype = ...@@ -3571,7 +3603,7 @@ Paragraph.prototype =
//---------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------
// Заливка параграфа // Заливка параграфа
//---------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------
if ( this.Lines[CurLine].Ranges[CurRange].W > 0.001 && ( ( this.Pages.length - 1 === CurPage ) || ( CurLine < this.Pages[CurPage + 1].FirstLine ) ) && shd_Clear === Pr.ParaPr.Shd.Value ) if ( (this.Lines[CurLine].Ranges[CurRange].W > 0.001 || true === this.IsEmpty() ) && ( ( this.Pages.length - 1 === CurPage ) || ( CurLine < this.Pages[CurPage + 1].FirstLine ) ) && shd_Clear === Pr.ParaPr.Shd.Value )
{ {
var TempX0 = this.Lines[CurLine].Ranges[CurRange].X; var TempX0 = this.Lines[CurLine].Ranges[CurRange].X;
if ( 0 === CurRange ) if ( 0 === CurRange )
...@@ -3652,7 +3684,7 @@ Paragraph.prototype = ...@@ -3652,7 +3684,7 @@ Paragraph.prototype =
if ( 0 === CurRange ) if ( 0 === CurRange )
{ {
if ( Pr.ParaPr.Brd.Left.Value === border_Single ) if ( Pr.ParaPr.Brd.Left.Value === border_Single )
TempX0 -= 1.9; TempX0 -= 1 + Pr.ParaPr.Brd.Left.Size + Pr.ParaPr.Brd.Left.Space;
else else
TempX0 -= 1; TempX0 -= 1;
} }
...@@ -3660,7 +3692,7 @@ Paragraph.prototype = ...@@ -3660,7 +3692,7 @@ Paragraph.prototype =
if ( this.Lines[CurLine].Ranges.length - 1 === CurRange ) if ( this.Lines[CurLine].Ranges.length - 1 === CurRange )
{ {
if ( Pr.ParaPr.Brd.Right.Value === border_Single ) if ( Pr.ParaPr.Brd.Right.Value === border_Single )
TempX1 += 1.9; TempX1 += 1 + Pr.ParaPr.Brd.Right.Size + Pr.ParaPr.Brd.Right.Space;
else else
TempX1 += 1; TempX1 += 1;
} }
...@@ -3752,13 +3784,13 @@ Paragraph.prototype = ...@@ -3752,13 +3784,13 @@ Paragraph.prototype =
if ( Pr.ParaPr.Brd.Right.Value === border_Single ) if ( Pr.ParaPr.Brd.Right.Value === border_Single )
{ {
pGraphics.p_color( Pr.ParaPr.Brd.Right.Color.r, Pr.ParaPr.Brd.Right.Color.g, Pr.ParaPr.Brd.Right.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Right.Color.r, Pr.ParaPr.Brd.Right.Color.g, Pr.ParaPr.Brd.Right.Color.b, 255 );
pGraphics.drawVerLine( c_oAscLineDrawingRule.Right, TempX1 + 1.9 + Pr.ParaPr.Brd.Right.Size, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Right.Size ); pGraphics.drawVerLine( c_oAscLineDrawingRule.Right, TempX1 + 1 + Pr.ParaPr.Brd.Right.Size + Pr.ParaPr.Brd.Right.Space, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Right.Size );
} }
if ( Pr.ParaPr.Brd.Left.Value === border_Single ) if ( Pr.ParaPr.Brd.Left.Value === border_Single )
{ {
pGraphics.p_color( Pr.ParaPr.Brd.Left.Color.r, Pr.ParaPr.Brd.Left.Color.g, Pr.ParaPr.Brd.Left.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Left.Color.r, Pr.ParaPr.Brd.Left.Color.g, Pr.ParaPr.Brd.Left.Color.b, 255 );
pGraphics.drawVerLine( c_oAscLineDrawingRule.Left, TempX0 - 1.9 - Pr.ParaPr.Brd.Left.Size, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Left.Size ); pGraphics.drawVerLine( c_oAscLineDrawingRule.Left, TempX0 - 1 - Pr.ParaPr.Brd.Left.Size - Pr.ParaPr.Brd.Left.Space, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Left.Size );
} }
} }
...@@ -4253,12 +4285,12 @@ Paragraph.prototype = ...@@ -4253,12 +4285,12 @@ Paragraph.prototype =
var X_right = this.Pages[CurPage].XLimit - Pr.ParaPr.Ind.Right; var X_right = this.Pages[CurPage].XLimit - Pr.ParaPr.Ind.Right;
if ( Pr.ParaPr.Brd.Left.Value === border_Single ) if ( Pr.ParaPr.Brd.Left.Value === border_Single )
X_left -= 1.9; X_left -= 1 + Pr.ParaPr.Brd.Left.Space;
else else
X_left -= 1; X_left -= 1;
if ( Pr.ParaPr.Brd.Right.Value === border_Single ) if ( Pr.ParaPr.Brd.Right.Value === border_Single )
X_right += 1.9; X_right += 1 + Pr.ParaPr.Brd.Right.Space;
else else
X_right += 1; X_right += 1;
...@@ -4273,19 +4305,46 @@ Paragraph.prototype = ...@@ -4273,19 +4305,46 @@ Paragraph.prototype =
Y_top += Pr.ParaPr.Spacing.Before; Y_top += Pr.ParaPr.Spacing.Before;
pGraphics.p_color( Pr.ParaPr.Brd.Top.Color.r, Pr.ParaPr.Brd.Top.Color.g, Pr.ParaPr.Brd.Top.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Top.Color.r, Pr.ParaPr.Brd.Top.Color.g, Pr.ParaPr.Brd.Top.Color.b, 255 );
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, Y_top, X_left, X_right, Pr.ParaPr.Brd.Top.Size, LeftMW, RightMW );
// Учтем разрывы из-за обтекания
var StartLine = this.Pages[CurPage].StartLine;
var RangesCount = this.Lines[StartLine].Ranges.length;
for ( var CurRange = 0; CurRange < RangesCount; CurRange++ )
{
var X0 = ( 0 === CurRange ? X_left : this.Lines[StartLine].Ranges[CurRange].X );
var X1 = ( RangesCount - 1 === CurRange ? X_right : this.Lines[StartLine].Ranges[CurRange].XEnd );
if ( this.Lines[StartLine].Ranges[CurRange].W > 0.001 )
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, Y_top, X0, X1, Pr.ParaPr.Brd.Top.Size, LeftMW, RightMW );
}
} }
else if ( false === Pr.ParaPr.Brd.First ) else if ( false === Pr.ParaPr.Brd.First )
{ {
var Size = 0;
var Y = 0;
if ( 1 === CurPage && true === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Top.Value ) if ( 1 === CurPage && true === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Top.Value )
{ {
pGraphics.p_color( Pr.ParaPr.Brd.Top.Color.r, Pr.ParaPr.Brd.Top.Color.g, Pr.ParaPr.Brd.Top.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Top.Color.r, Pr.ParaPr.Brd.Top.Color.g, Pr.ParaPr.Brd.Top.Color.b, 255 );
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, this.Pages[CurPage].Y + this.Lines[this.Pages[CurPage].FirstLine].Top, X_left, X_right, Pr.ParaPr.Brd.Top.Size, LeftMW, RightMW ); Size = Pr.ParaPr.Brd.Top.Size;
Y = this.Pages[CurPage].Y + this.Lines[this.Pages[CurPage].FirstLine].Top;
} }
else if ( 0 === CurPage && false === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Between.Value ) else if ( 0 === CurPage && false === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Between.Value )
{ {
pGraphics.p_color( Pr.ParaPr.Brd.Between.Color.r, Pr.ParaPr.Brd.Between.Color.g, Pr.ParaPr.Brd.Between.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Between.Color.r, Pr.ParaPr.Brd.Between.Color.g, Pr.ParaPr.Brd.Between.Color.b, 255 );
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, this.Pages[CurPage].Y, X_left, X_right, Pr.ParaPr.Brd.Between.Size, LeftMW, RightMW ); Size = Pr.ParaPr.Brd.Between.Size;
Y = this.Pages[CurPage].Y;
}
// Учтем разрывы из-за обтекания
var StartLine = this.Pages[CurPage].StartLine;
var RangesCount = this.Lines[StartLine].Ranges.length;
for ( var CurRange = 0; CurRange < RangesCount; CurRange++ )
{
var X0 = ( 0 === CurRange ? X_left : this.Lines[StartLine].Ranges[CurRange].X );
var X1 = ( RangesCount - 1 === CurRange ? X_right : this.Lines[StartLine].Ranges[CurRange].XEnd );
if ( this.Lines[StartLine].Ranges[CurRange].W > 0.001 )
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, Y, X0, X1, Size, LeftMW, RightMW );
} }
} }
...@@ -4310,7 +4369,18 @@ Paragraph.prototype = ...@@ -4310,7 +4369,18 @@ Paragraph.prototype =
} }
pGraphics.p_color( Pr.ParaPr.Brd.Bottom.Color.r, Pr.ParaPr.Brd.Bottom.Color.g, Pr.ParaPr.Brd.Bottom.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Bottom.Color.r, Pr.ParaPr.Brd.Bottom.Color.g, Pr.ParaPr.Brd.Bottom.Color.b, 255 );
pGraphics.drawHorLineExt( DrawLineRule, TempY, X_left, X_right, Pr.ParaPr.Brd.Bottom.Size, LeftMW, RightMW );
// Учтем разрывы из-за обтекания
var EndLine = this.Pages[CurPage].EndLine;
var RangesCount = this.Lines[EndLine].Ranges.length;
for ( var CurRange = 0; CurRange < RangesCount; CurRange++ )
{
var X0 = ( 0 === CurRange ? X_left : this.Lines[EndLine].Ranges[CurRange].X );
var X1 = ( RangesCount - 1 === CurRange ? X_right : this.Lines[EndLine].Ranges[CurRange].XEnd );
if ( this.Lines[EndLine].Ranges[CurRange].W > 0.001 )
pGraphics.drawHorLineExt( DrawLineRule, TempY, X0, X1, Pr.ParaPr.Brd.Bottom.Size, LeftMW, RightMW );
}
} }
else if ( true === bEnd && false === Pr.ParaPr.Brd.Last && border_Single === Pr.ParaPr.Brd.Bottom.Value ) else if ( true === bEnd && false === Pr.ParaPr.Brd.Last && border_Single === Pr.ParaPr.Brd.Bottom.Value )
{ {
...@@ -4318,7 +4388,18 @@ Paragraph.prototype = ...@@ -4318,7 +4388,18 @@ Paragraph.prototype =
if ( null != NextEl && type_Paragraph === NextEl.GetType() && true === NextEl.Is_StartFromNewPage() ) if ( null != NextEl && type_Paragraph === NextEl.GetType() && true === NextEl.Is_StartFromNewPage() )
{ {
pGraphics.p_color( Pr.ParaPr.Brd.Bottom.Color.r, Pr.ParaPr.Brd.Bottom.Color.g, Pr.ParaPr.Brd.Bottom.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Bottom.Color.r, Pr.ParaPr.Brd.Bottom.Color.g, Pr.ParaPr.Brd.Bottom.Color.b, 255 );
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, this.Pages[CurPage].Y + this.Lines[CurLine].Y + this.Lines[CurLine].Metrics.Descent + this.Lines[CurLine].Metrics.LineGap, X_left, X_right, Pr.ParaPr.Brd.Bottom.Size, LeftMW, RightMW );
// Учтем разрывы из-за обтекания
var EndLine = this.Pages[CurPage].EndLine;
var RangesCount = this.Lines[EndLine].Ranges.length;
for ( var CurRange = 0; CurRange < RangesCount; CurRange++ )
{
var X0 = ( 0 === CurRange ? X_left : this.Lines[EndLine].Ranges[CurRange].X );
var X1 = ( RangesCount - 1 === CurRange ? X_right : this.Lines[EndLine].Ranges[CurRange].XEnd );
if ( this.Lines[EndLine].Ranges[CurRange].W > 0.001 )
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, this.Pages[CurPage].Y + this.Lines[CurLine].Y + this.Lines[CurLine].Metrics.Descent + this.Lines[CurLine].Metrics.LineGap, X0, X1, Pr.ParaPr.Brd.Bottom.Size, LeftMW, RightMW );
}
} }
} }
......
Word/TextEditor.html
View file @ 06cc9fa8
...@@ -2088,6 +2088,10 @@ ...@@ -2088,6 +2088,10 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div id="prBrdSpace" style="float:left;width:150px;">
<input id="prBrdSpaceVals" style="width: 100px" /> Space
</div>
<div style="float:left;width:150px;"> <div style="float:left;width:150px;">
<input id="prBrdType" type="checkbox" checked="true"/> Single <input id="prBrdType" type="checkbox" checked="true"/> Single
</div> </div>
......
Word/menu/main_menu.js
View file @ 06cc9fa8
...@@ -375,7 +375,7 @@ $(document).ready(function(){ ...@@ -375,7 +375,7 @@ $(document).ready(function(){
} }
); );
$("#imgW, #imgH, #imgLeft, #imgTop, #imgRight, #imgBottom, #imgX, #imgY, #hafHF, #tblW, #tblCS, #tblMarLeft, #tblMarTop, #tblMarRight, #tblMarBottom, #tblIndentLeft, #tblLeft, #tblTop, #tblRight, #tblBottom, #tblBrdBGColor, #imgURL, #tblDefMarLeft, #tblDefMarTop, #tblDefMarRight, #tblDefMarBottom, #tblX, #tblY, #prFirst, #prLeft, #prRight, #prLineHeight, #prAfter, #prBefore, #hyperToolTip, #hyperUrl, #hyperText, #prTextSpacing, #prTextPosition, #prTextPosition, #imgPositionVPosValueCombo, #imgPositionHPosValueCombo, #tblHeaderRowsCount, #tblPositionVPosValueCombo, #tblPositionHPosValueCombo, #searchString, #replaceString") $("#imgW, #imgH, #imgLeft, #imgTop, #imgRight, #imgBottom, #imgX, #imgY, #hafHF, #tblW, #tblCS, #tblMarLeft, #tblMarTop, #tblMarRight, #tblMarBottom, #tblIndentLeft, #tblLeft, #tblTop, #tblRight, #tblBottom, #tblBrdBGColor, #imgURL, #tblDefMarLeft, #tblDefMarTop, #tblDefMarRight, #tblDefMarBottom, #tblX, #tblY, #prFirst, #prLeft, #prRight, #prLineHeight, #prAfter, #prBefore, #hyperToolTip, #hyperUrl, #hyperText, #prTextSpacing, #prTextPosition, #prTextPosition, #imgPositionVPosValueCombo, #imgPositionHPosValueCombo, #tblHeaderRowsCount, #tblPositionVPosValueCombo, #tblPositionHPosValueCombo, #searchString, #replaceString, #prBrdSpaceVals")
.focus(function(){editor.asc_enableKeyEvents(false);}) .focus(function(){editor.asc_enableKeyEvents(false);})
.blur(function(){editor.asc_enableKeyEvents(true);}) .blur(function(){editor.asc_enableKeyEvents(true);})
...@@ -3060,81 +3060,69 @@ $(".colorWatch").mouseover(function(){ ...@@ -3060,81 +3060,69 @@ $(".colorWatch").mouseover(function(){
Bits[1] = Bits[2] = Bits[3] = 0; Bits[1] = Bits[2] = Bits[3] = 0;
} }
var nSpace = parseFloat(document.getElementById("prBrdSpaceVals").value);
var Space = (isNaN(nSpace) ? 0 : nSpace) * g_dKoef_pt_to_mm;
var BrdType = document.getElementById("prBrdType").checked ? border_Single : border_None; var BrdType = document.getElementById("prBrdType").checked ? border_Single : border_None;
var BrdObj = var BrdObj =
{ {
Bottom : Bottom :
(!document.getElementById("prBrdBottom").checked? (!document.getElementById("prBrdBottom").checked?
{ undefined
Color : null,
Value : null,
Size : null
}
: :
{ {
Color : { r : Bits[1], g : Bits[2], b : Bits[3] }, Color : { r : Bits[1], g : Bits[2], b : Bits[3] },
Value : BrdType, Value : BrdType,
Space : Space,
Size : BrdSize Size : BrdSize
} }
), ),
Left : Left :
(!document.getElementById("prBrdLeft").checked? (!document.getElementById("prBrdLeft").checked?
{ undefined
Color : null,
Value : null,
Size : null
}
: :
{ {
Color : { r : Bits[1], g : Bits[2], b : Bits[3] }, Color : { r : Bits[1], g : Bits[2], b : Bits[3] },
Value : BrdType, Value : BrdType,
Space : Space,
Size : BrdSize Size : BrdSize
} }
), ),
Right : Right :
(!document.getElementById("prBrdRight").checked? (!document.getElementById("prBrdRight").checked?
{ undefined
Color : null,
Value : null,
Size : null
}
: :
{ {
Color : { r : Bits[1], g : Bits[2], b : Bits[3] }, Color : { r : Bits[1], g : Bits[2], b : Bits[3] },
Value : BrdType, Value : BrdType,
Space : Space,
Size : BrdSize Size : BrdSize
} }
), ),
Top : Top :
(!document.getElementById("prBrdTop").checked? (!document.getElementById("prBrdTop").checked?
{ undefined
Color : null,
Value : null,
Size : null
}
: :
{ {
Color : { r : Bits[1], g : Bits[2], b : Bits[3] }, Color : { r : Bits[1], g : Bits[2], b : Bits[3] },
Value : BrdType, Value : BrdType,
Space : Space,
Size : BrdSize Size : BrdSize
} }
), ),
Between : Between :
(!document.getElementById("prBrdBetween").checked? (!document.getElementById("prBrdBetween").checked?
{ undefined
Color : null,
Value : null,
Size : null
}
: :
{ {
Color : { r : Bits[1], g : Bits[2], b : Bits[3] }, Color : { r : Bits[1], g : Bits[2], b : Bits[3] },
Value : BrdType, Value : BrdType,
Space : Space,
Size : BrdSize Size : BrdSize
} }
) )
......
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