pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix WorksheetGrid painting issue with merged cells (http://forum.lazarus.freepascal.org/index.php/topic,36276.msg241563/topicseen.html)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5817 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-03-22 22:08:25 +00:00
parent cfc27bc84b
commit fe861e4d49
1 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2581,16 +2581,12 @@ procedure TsCustomWorksheetGrid.DrawRow(ARow: Integer);
var var
gr, gc, gcLast: Integer; // grid row/column gr, gc, gcLast: Integer; // grid row/column
fc: Integer; // Fixed columns (= header column + frozen columns) fc: Integer; // Fixed columns (= header column + frozen columns)
tmp: Integer;
rct, row_rct, header_rct: TRect; rct, row_rct, header_rct: TRect;
clipArea: TRect; clipArea: TRect;
begin begin
clipArea := Canvas.ClipRect; clipArea := Canvas.ClipRect;
if BiDiMode = bdRightToLeft then // Upper and lower bounds for this row
tmp := 1;
// Upper and Lower bounds for this row
row_rct := Rect(clipArea.Left, 0, clipArea.Right, 0); row_rct := Rect(clipArea.Left, 0, clipArea.Right, 0);
ColRowToOffSet(False, True, ARow, row_rct.Top, row_rct.Bottom); ColRowToOffSet(False, True, ARow, row_rct.Top, row_rct.Bottom);
@ -2623,16 +2619,6 @@ begin
rct.Right := FTopLeft.X rct.Right := FTopLeft.X
else else
rct.Left := FTopLeft.X; rct.Left := FTopLeft.X;
{
if fc > 0 then begin
if IsRightToLeft then
ColRowToOffset(true, true, fc-1, rct.Right, tmp)
else begin
ColRowToOffset(true, true, fc-1, tmp, rct.Left);
dec(rct.Left);
end;
end;
}
InternalDrawRow(ARow, gc, gcLast, rct); InternalDrawRow(ARow, gc, gcLast, rct);
end; end;
@ -2652,16 +2638,6 @@ begin
rct.Left := FTopLeft.X rct.Left := FTopLeft.X
else else
rct.Right := FTopLeft.X; rct.Right := FTopLeft.X;
{
if IsRightToLeft then begin
rct.Right := header_rct.Left;
ColRowToOffset(true, true, fc-1, rct.Left, tmp);
end else begin
rct.Left := header_rct.Right;
if fc > 0 then
ColRowToOffset(true, true, fc-1, tmp, rct.Right);
end;
}
InternalDrawRow(ARow, FHeaderCount, fc-1, rct); InternalDrawRow(ARow, FHeaderCount, fc-1, rct);
end; end;
end; end;
@ -3985,7 +3961,7 @@ var
tmp: Integer = 0; tmp: Integer = 0;
cell: PCell; cell: PCell;
fmt: PsCellFormat; fmt: PsCellFormat;
rct, commentcell_rct, temp_rct: TRect; rct, clip_rct, commentcell_rct, temp_rct: TRect;
gds: TGridDrawState; gds: TGridDrawState;
clipArea: TRect; clipArea: TRect;
@ -4139,17 +4115,20 @@ begin
end; end;
end; end;
// Take care of upper and lower bounds of merged cells!
temp_rct := rct;
rct := CellRect(gc, gr, gcNext-1, gr); rct := CellRect(gc, gr, gcNext-1, gr);
rct.Top := AClipRect.Top; rct.Top := temp_rct.Top;
rct.Bottom := AClipRect.Bottom; rct.Bottom := temp_rct.Bottom;
if (rct.Left < rct.Right) and HorizontalIntersect(rct, clipArea) then if (rct.Left < rct.Right) and HorizontalIntersect(rct, clipArea) then
begin begin
temp_rct := rct; clip_rct := rct;
// if IsRightToLeft then dec(rct.Right); // wp: There's still a 1-pixel gap in the dark fixed-cell border clip_rct.Top := AClipRect.Top;
clip_rct.Bottom := AClipRect.Bottom;
gds := GetGridDrawState(gc, gr); gds := GetGridDrawState(gc, gr);
// Draw cell // Draw cell
InternalDrawCell(gc, gr, temp_rct, rct, gds); InternalDrawCell(gc, gr, clip_rct, rct, gds);
// Draw comment marker // Draw comment marker
if (commentcell_rct.Left <> 0) and (commentcell_rct.Right <> 0) and if (commentcell_rct.Left <> 0) and (commentcell_rct.Right <> 0) and
(commentcell_rct.Top <> 0) and (commentcell_rct.Bottom <> 0) (commentcell_rct.Top <> 0) and (commentcell_rct.Bottom <> 0)