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

RxFPC:fix footer row height

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8084 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2021-09-10 13:03:24 +00:00
parent 4fa697e0ea
commit 82b3417f13
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -3395,7 +3395,8 @@ var
tmpCanvas: TCanvas; tmpCanvas: TCanvas;
FWC: SizeInt; FWC: SizeInt;
begin begin
FDefRowH:=GetDefaultRowHeight; //FDefRowH:=GetDefaultRowHeight;
FDefRowH:=DefaultRowHeight;
{ TODO -oalexs : need rewrite code - split to 2 step: { TODO -oalexs : need rewrite code - split to 2 step:
1. make links between column 1. make links between column
@ -3603,7 +3604,8 @@ begin
if Assigned(FFilterListEditor) then if Assigned(FFilterListEditor) then
Result.Top := bRect.Bottom - FFilterListEditor.Height Result.Top := bRect.Bottom - FFilterListEditor.Height
else else
Result.Top := bRect.Bottom - GetDefaultRowHeight; Result.Top := bRect.Bottom - DefaultRowHeight;
// Result.Top := bRect.Bottom - GetDefaultRowHeight;
end; end;
function TRxDBGrid.getTitleRect(bRect: TRect): TRect; function TRxDBGrid.getTitleRect(bRect: TRect): TRect;
@ -3612,7 +3614,8 @@ begin
if Assigned(FFilterListEditor) then if Assigned(FFilterListEditor) then
Result.Bottom := bRect.Bottom - FFilterListEditor.Height Result.Bottom := bRect.Bottom - FFilterListEditor.Height
else else
Result.Bottom := bRect.Bottom - GetDefaultRowHeight; Result.Bottom := bRect.Bottom - DefaultRowHeight
// Result.Bottom := bRect.Bottom - GetDefaultRowHeight;
end; end;
procedure TRxDBGrid.OutCaptionCellText(aCol, aRow: integer; const aRect: TRect; procedure TRxDBGrid.OutCaptionCellText(aCol, aRow: integer; const aRect: TRect;
@ -4041,7 +4044,9 @@ begin
begin begin
if Assigned(FOnCalcRowHeight) then if Assigned(FOnCalcRowHeight) then
FOnCalcRowHeight(Self, H); FOnCalcRowHeight(Self, H);
RowHeights[i] := GetDefaultRowHeight * H; //RowHeights[i] := GetDefaultRowHeight * H;
RowHeights[i] := DefaultRowHeight * H;
H2:=H2 + RowHeights[i]; H2:=H2 + RowHeights[i];
if H2<=ClientHeight then if H2<=ClientHeight then
Inc(Result); Inc(Result);
@ -4055,7 +4060,8 @@ var
i:integer; i:integer;
begin begin
for i:=1 to RowCount-1 do for i:=1 to RowCount-1 do
RowHeights[i] := GetDefaultRowHeight; RowHeights[i] := DefaultRowHeight
// RowHeights[i] := GetDefaultRowHeight;
end; end;
procedure TRxDBGrid.DoClearInvalidTitle; procedure TRxDBGrid.DoClearInvalidTitle;
@ -5428,7 +5434,8 @@ begin
Rct := CellRect(0, 0); Rct := CellRect(0, 0);
MPT.X := Rct.Left; MPT.X := Rct.Left;
if rdgFilter in FOptionsRx then if rdgFilter in FOptionsRx then
MPT.Y := Rct.Bottom - GetDefaultRowHeight // MPT.Y := Rct.Bottom - GetDefaultRowHeight
MPT.Y := Rct.Bottom - DefaultRowHeight
else else
MPT.Y := Rct.Bottom; MPT.Y := Rct.Bottom;
MPT := ClientToScreen(MPT); MPT := ClientToScreen(MPT);
@ -5631,7 +5638,8 @@ var
begin begin
Inc(FInProcessCalc); Inc(FInProcessCalc);
DoClearInvalidTitle; DoClearInvalidTitle;
FDrawGetDefaultRowHeight:=GetDefaultRowHeight; // FDrawGetDefaultRowHeight:=GetDefaultRowHeight;
FDrawGetDefaultRowHeight:=DefaultRowHeight;
inherited Paint; inherited Paint;
@ -5659,21 +5667,25 @@ begin
if dgTitles in Options then if dgTitles in Options then
Dec(Result, 1);} Dec(Result, 1);}
if GetDefaultRowHeight > 0 then //if GetDefaultRowHeight > 0 then
if DefaultRowHeight > 0 then
begin begin
H:=ClientHeight; H:=ClientHeight;
if FFooterOptions.Active then if FFooterOptions.Active then
H:=H - GetDefaultRowHeight * FFooterOptions.RowCount; //H:=H - GetDefaultRowHeight * FFooterOptions.RowCount;
H:=H - DefaultRowHeight * FFooterOptions.RowCount;
Result := H div GetDefaultRowHeight; //Result := H div GetDefaultRowHeight;
Result := H div DefaultRowHeight;
if rdgFilter in OptionsRx then if rdgFilter in OptionsRx then
Dec(Result, 1); Dec(Result, 1);
if dgTitles in Options then if dgTitles in Options then
//Dec(Result, 1); //Dec(Result, 1);
Result:=Result - RowHeights[0] div GetDefaultRowHeight; //Result:=Result - RowHeights[0] div GetDefaultRowHeight;
Result:=Result - RowHeights[0] div DefaultRowHeight;
end end
else else
Result := 1; Result := 1;
@ -5894,7 +5906,8 @@ begin
begin begin
P:=GCache.MaxClientXY; P:=GCache.MaxClientXY;
with GCache do with GCache do
MaxClientXY.Y:=MaxClientXY.Y - (GetDefaultRowHeight * FFooterOptions.RowCount + 2); //MaxClientXY.Y:=MaxClientXY.Y - (GetDefaultRowHeight * FFooterOptions.RowCount + 2);
MaxClientXY.Y:=MaxClientXY.Y - (DefaultRowHeight * FFooterOptions.RowCount + 2);
end; end;
if ((rdgWordWrap in FOptionsRx) or (Assigned(FGroupItems) and FGroupItems.Active)) and (HandleAllocated) then if ((rdgWordWrap in FOptionsRx) or (Assigned(FGroupItems) and FGroupItems.Active)) and (HandleAllocated) then