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

fpspreadsheet: Fix igoring wordwrap flags when painting wordwrapped frozen cells (see forum http://forum.lazarus.freepascal.org/index.php/topic,33453.msg216815/).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5025 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-07-23 09:31:57 +00:00
parent a7cab840e7
commit 5bbdbed004
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -2441,24 +2441,28 @@ begin
if (ACol < FHeaderCount) or (ARow < FHeaderCount) then
lCell := nil
else
lCell := FDrawingCell;
else begin
if FDrawingCell = nil then
lCell := Worksheet.FindCell(GetWorksheetRow(ARow), GetWorksheetCol(ACol))
else
lCell := FDrawingCell
end;
// Header
if lCell = nil then
if (lCell = nil) and ShowHeaders and ((ACol = 0) or (ARow = 0)) then
begin
if ShowHeaders and ((ACol = 0) or (ARow = 0)) then
begin
ts.Alignment := taCenter;
ts.Layout := tlCenter;
ts.Opaque := false;
Canvas.TextStyle := ts;
end;
ts.Alignment := taCenter;
ts.Layout := tlCenter;
ts.Opaque := false;
Canvas.TextStyle := ts;
inherited DrawCellText(aCol, aRow, aRect, aState, GetCellText(ACol,ARow));
exit;
end;
// Cells
if lCell = nil then
exit;
txt := GetCellText(GetGridRow(lCell^.Col), GetGridCol(lCell^.Row));
if txt = '' then
exit;