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

fpspreadsheet: Fix autorowheight calculation in grid hanging if row contains a zero-width column

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4616 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-04-11 09:56:53 +00:00
parent 8025b4fd9e
commit d24bf8307f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/fpspreadsheet/fpsvisualutils.pas
View File

@ -266,6 +266,9 @@ function RichTextWidth(ACanvas: TCanvas; AWorkbook: TsWorkbook; ARect: TRect;
var var
painter: TsTextPainter; painter: TsTextPainter;
begin begin
if (ARect.Left = ARect.Right) or (ARect.Top = ARect.Bottom) then
exit(0);
painter := TsTextPainter.Create(ACanvas, AWorkbook, ARect, AText, ARichTextParams, painter := TsTextPainter.Create(ACanvas, AWorkbook, ARect, AText, ARichTextParams,
AFontIndex, ATextRotation, haLeft, vaTop, AWordWrap, ARightToLeft); AFontIndex, ATextRotation, haLeft, vaTop, AWordWrap, ARightToLeft);
try try
@ -281,6 +284,9 @@ function RichTextHeight(ACanvas: TCanvas; AWorkbook: TsWorkbook; ARect: TRect;
var var
painter: TsTextPainter; painter: TsTextPainter;
begin begin
if (ARect.Left = ARect.Right) or (ARect.Top = ARect.Bottom) then
exit(0);
painter := TsTextPainter.Create(ACanvas, AWorkbook, ARect, AText, ARichTextParams, painter := TsTextPainter.Create(ACanvas, AWorkbook, ARect, AText, ARichTextParams,
AFontIndex, ATextRotation, haLeft, vaTop, AWordWrap, ARightToLeft); AFontIndex, ATextRotation, haLeft, vaTop, AWordWrap, ARightToLeft);
try try