paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Another attempt to fix overwriting of frozencols borderline by cells with borders.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8060 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2021-07-11 14:04:46 +00:00
parent 4bbe58f7cf
commit a0801dd183
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@ -2668,13 +2668,13 @@ begin
end;
// 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
DrawBorderLine(ARect.Right, ARect, drawVert, bs)
else
DrawBorderLine(ARect.Left-ord(not IsRightToLeft), ARect, drawVert, bs);
// 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
DrawBorderLine(ARect.Left, ARect, drawVert, bs)
else
@ -3462,7 +3462,7 @@ procedure TsCustomWorksheetGrid.FixNeighborCellBorders(ACell: PCell);
neighbor := Worksheet.FindCell(NewRow, NewCol);
if neighbor <> nil then
begin
border := Worksheet.ReadCelLBorders(neighbor);
border := Worksheet.ReadCellBorders(neighbor);
if AInclude then
begin
Include(border, ANewBorder);