fpspreadsheet: Another attempt to fix overwriting of frozencols borderline by cells with borders.
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8060 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
parent
4bbe58f7cf
commit
a0801dd183
@ -2668,13 +2668,13 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
// Left border
|
// Left border
|
||||||
if GetBorderStyle(ACol, ARow, -1, 0, ACell, bs) and (ACol <> FixedCols) then
|
if GetBorderStyle(ACol, ARow, -1, 0, ACell, bs) and (ACol <> LeftCol) then
|
||||||
if IsRightToLeft then
|
if IsRightToLeft then
|
||||||
DrawBorderLine(ARect.Right, ARect, drawVert, bs)
|
DrawBorderLine(ARect.Right, ARect, drawVert, bs)
|
||||||
else
|
else
|
||||||
DrawBorderLine(ARect.Left-ord(not IsRightToLeft), ARect, drawVert, bs);
|
DrawBorderLine(ARect.Left-ord(not IsRightToLeft), ARect, drawVert, bs);
|
||||||
// Right border
|
// Right border
|
||||||
if GetBorderStyle(ACol, ARow, +1, 0, ACell, bs) and (ACol + 1 <> FixedCols) then
|
if GetBorderStyle(ACol, ARow, +1, 0, ACell, bs) and (ACol + 1 <> LeftCol) then
|
||||||
if IsRightToLeft then
|
if IsRightToLeft then
|
||||||
DrawBorderLine(ARect.Left, ARect, drawVert, bs)
|
DrawBorderLine(ARect.Left, ARect, drawVert, bs)
|
||||||
else
|
else
|
||||||
@ -3462,7 +3462,7 @@ procedure TsCustomWorksheetGrid.FixNeighborCellBorders(ACell: PCell);
|
|||||||
neighbor := Worksheet.FindCell(NewRow, NewCol);
|
neighbor := Worksheet.FindCell(NewRow, NewCol);
|
||||||
if neighbor <> nil then
|
if neighbor <> nil then
|
||||||
begin
|
begin
|
||||||
border := Worksheet.ReadCelLBorders(neighbor);
|
border := Worksheet.ReadCellBorders(neighbor);
|
||||||
if AInclude then
|
if AInclude then
|
||||||
begin
|
begin
|
||||||
Include(border, ANewBorder);
|
Include(border, ANewBorder);
|
||||||
|
Loading…
Reference in New Issue
Block a user