Commit 50763ee8 authored by Ilya.Kirillov's avatar Ilya.Kirillov

Исправлен баг с отрисовкой тонких границ поверж толстых.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55072 954022d7-b5bf-4e40-9824-e11837661b57
parent 29a156b6
...@@ -4001,6 +4001,7 @@ CTable.prototype = ...@@ -4001,6 +4001,7 @@ CTable.prototype =
// Левая граница // Левая граница
var BorderInfo_Left = CellBordersInfo.Left; var BorderInfo_Left = CellBordersInfo.Left;
// Это значение может не совпадать с CurRow // Это значение может не совпадать с CurRow
var TempCurRow = Cell.Row.Index; var TempCurRow = Cell.Row.Index;
...@@ -4035,6 +4036,7 @@ CTable.prototype = ...@@ -4035,6 +4036,7 @@ CTable.prototype =
} }
} }
// Правая граница // Правая граница
var BorderInfo_Right = CellBordersInfo.Right; var BorderInfo_Right = CellBordersInfo.Right;
for ( var Index = Row_side_border_start; Index <= Row_side_border_end; Index++ ) for ( var Index = Row_side_border_start; Index <= Row_side_border_end; Index++ )
...@@ -4072,9 +4074,10 @@ CTable.prototype = ...@@ -4072,9 +4074,10 @@ CTable.prototype =
} }
} }
// Верхняя граница // Верхняя граница
var LastBorderTop_prev = { W : LastBorderTop.W, H : LastBorderTop.H };
var BorderInfo_Top = CellBordersInfo.Top; var BorderInfo_Top = CellBordersInfo.Top;
var LastBorderTop_prev = { W : LastBorderTop.W, H : LastBorderTop.H };
for ( var Index = 0; Index < BorderInfo_Top.length; Index++ ) for ( var Index = 0; Index < BorderInfo_Top.length; Index++ )
{ {
var CurBorderInfo = BorderInfo_Top[Index]; var CurBorderInfo = BorderInfo_Top[Index];
...@@ -4153,6 +4156,9 @@ CTable.prototype = ...@@ -4153,6 +4156,9 @@ CTable.prototype =
RightMW = Max_r;//X1 += Max_r; RightMW = Max_r;//X1 += Max_r;
else else
RightMW = -Max_r;//X1 -= Max_r; RightMW = -Max_r;//X1 -= Max_r;
if ( border_Single === CurBorderInfo.Value && CurBorderInfo.Size <= BorderInfo_Right[0].Size )
RightMW = -BorderInfo_Right[0].Size / 2;
} }
if ( 0 === Index ) if ( 0 === Index )
...@@ -4218,6 +4224,9 @@ CTable.prototype = ...@@ -4218,6 +4224,9 @@ CTable.prototype =
//X0 -= Max_l; //X0 -= Max_l;
LeftMW = -Max_l; LeftMW = -Max_l;
if ( border_Single === CurBorderInfo.Value && CurBorderInfo.Size <= BorderInfo_Left[0].Size )
LeftMW = BorderInfo_Left[0].Size / 2;
LastBorderTop.L = Max_l; LastBorderTop.L = Max_l;
LastBorderTop.W = 0; LastBorderTop.W = 0;
......
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