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

LCL/grids: Draw checkbox at vertical position defined by Column.Layout

Browse Source 
git-svn-id: trunk@61689 -
This commit is contained in:
wp 2019-08-13 14:13:36 +00:00
parent 0ff8e75f53
commit 90a7301300
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/grids.pas
View File

@ -3412,7 +3412,8 @@ var
begin begin
if HandleAllocated then begin if HandleAllocated then begin
{$Ifdef DbgScroll} {$Ifdef DbgScroll}
DebugLn('ScrollbarPage: Which=',SbToStr(Which), ' Avalue=',dbgs(aPage)); DebugLn('Scrollbar
Page: Which=',SbToStr(Which), ' Avalue=',dbgs(aPage));
{$endif} {$endif}
ScrollInfo.cbSize := SizeOf(ScrollInfo); ScrollInfo.cbSize := SizeOf(ScrollInfo);
ScrollInfo.fMask := SIF_PAGE; ScrollInfo.fMask := SIF_PAGE;
@ -4621,15 +4622,21 @@ var
PaintRect: TRect; PaintRect: TRect;
CSize: TSize; CSize: TSize;
bmpAlign: TAlignment; bmpAlign: TAlignment;
bmpLayout: TTextLayout;
ChkIL: TCustomImageList; ChkIL: TCustomImageList;
ChkII: TImageIndex; ChkII: TImageIndex;
ChkILRes: TScaledImageListResolution; ChkILRes: TScaledImageListResolution;
begin begin
if Columns.Enabled then if Columns.Enabled then
bmpAlign := GetColumnAlignment(aCol, false) begin
else bmpAlign := GetColumnAlignment(aCol, false);
bmpLayout := GetColumnLayout(aCol, false);
end else
begin
bmpAlign := taCenter; bmpAlign := taCenter;
bmpLayout := Canvas.TextStyle.Layout;
end;
Details.State := -1; Details.State := -1;
ChkIL := nil; ChkIL := nil;
@ -4653,11 +4660,16 @@ begin
end; end;
case bmpAlign of case bmpAlign of
taCenter: PaintRect.Left := Trunc((aRect.Left + aRect.Right - CSize.cx)/2); taCenter: PaintRect.Left := (aRect.Left + aRect.Right - CSize.cx) div 2;
taLeftJustify: PaintRect.Left := ARect.Left + varCellPadding; taLeftJustify: PaintRect.Left := ARect.Left + varCellPadding;
taRightJustify: PaintRect.Left := ARect.Right - CSize.Cx - varCellPadding - 1; taRightJustify: PaintRect.Left := ARect.Right - CSize.Cx - varCellPadding - 1;
end; end;
PaintRect.Top := Trunc((aRect.Top + aRect.Bottom - CSize.cy)/2);
case bmpLayout of
tlTop : PaintRect.Top := aRect.Top + varCellPadding;
tlCenter : PaintRect.Top := (aRect.Top + aRect.Bottom - CSize.cy) div 2;
tlBottom : PaintRect.Top := aRect.Bottom - varCellPadding - CSize.cy - 1;
end;
PaintRect := Bounds(PaintRect.Left, PaintRect.Top, CSize.cx, CSize.cy); PaintRect := Bounds(PaintRect.Left, PaintRect.Top, CSize.cx, CSize.cy);
if Details.State>=0 then if Details.State>=0 then