paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 14:36:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, grids: fix auto adjust column for multilined columns

Browse Source 
git-svn-id: trunk@49023 -
This commit is contained in:
jesus 2015-05-14 20:29:08 +00:00
parent 670c24309d
commit 9bcbe8918d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/grids.pas
View File

@ -10328,6 +10328,9 @@ var
Ts: TSize;
TmpCanvas: TCanvas;
C: TGridColumn;
aRect: TRect;
isMultiLine: Boolean;
aText: string;
begin
if (aCol<0) or (aCol>ColCount-1) then
Exit;
@ -10335,6 +10338,7 @@ begin
tmpCanvas := GetWorkingCanvas(Canvas);
C := ColumnFromGridColumn(aCol);
isMultiLine := (C<>nil) and C.Title.MultiLine;
try
W:=0;
@ -10353,9 +10357,16 @@ begin
end;
if (i=0) and (FixedRows>0) and (C<>nil) then
Ts := TmpCanvas.TextExtent(C.Title.Caption)
aText := C.Title.Caption
else
Ts := TmpCanvas.TextExtent(Cells[aCol, i]);
aText := Cells[aCol, i];
if isMultiLine then begin
aRect := rect(0, 0, DefaultColWidth, DefaultRowHeight);
DrawText(tmpCanvas.Handle, @aText[1], Length(aText), aRect, DT_CALCRECT or DT_WORDBREAK);
Ts.cx := aRect.Right-aRect.Left;
end else
Ts := tmpCanvas.TextExtent(aText);
if Ts.Cx>W then
W := Ts.Cx;