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

minor fix filter bar in rxdbgrid

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@990 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2009-10-28 19:31:30 +00:00
parent 9c6bbd1077
commit 186534c2e0
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
components/rx/rxdbgrid.pas
View File

@ -931,12 +931,24 @@ begin
end; end;
procedure TRxDBGrid.SetOptionsRx(const AValue: TOptionsRx); procedure TRxDBGrid.SetOptionsRx(const AValue: TOptionsRx);
var
OldOpt:TOptionsRx;
begin begin
if FOptionsRx=AValue then exit; if FOptionsRx=AValue then exit;
OldOpt:=FOptionsRx;
FOptionsRx:=AValue; FOptionsRx:=AValue;
UseXORFeatures:=rdgXORColSizing in FOptionsRx; UseXORFeatures:=rdgXORColSizing in AValue;
if rdgFilter in FOptionsRx then if (rdgFilter in AValue) and not (rdgFilter in OldOpt) then
begin begin
LayoutChanged;
BeginUpdate;
CalcTitle;
EndUpdate;
end
else
if rdgFilter in OldOpt then
begin
FFilterListEditor.Hide;
LayoutChanged; LayoutChanged;
BeginUpdate; BeginUpdate;
CalcTitle; CalcTitle;
@ -1083,7 +1095,10 @@ begin
if rdgFilter in OptionsRx then if rdgFilter in OptionsRx then
begin begin
RowHeights[0] := RowHeights[0] + DefaultRowHeight; if Assigned(FFilterListEditor) then
RowHeights[0] := RowHeights[0] + FFilterListEditor.Height
else
RowHeights[0] := RowHeights[0] + DefaultRowHeight;
end; end;
finally finally
@ -1119,13 +1134,19 @@ end;
function TRxDBGrid.getFilterRect(bRect: TRect): TRect; function TRxDBGrid.getFilterRect(bRect: TRect): TRect;
begin begin
Result := bRect; Result := bRect;
Result.Top := bRect.Bottom - DefaultRowHeight; if Assigned(FFilterListEditor) then
Result.Top := bRect.Bottom - FFilterListEditor.Height
else
Result.Top := bRect.Bottom - DefaultRowHeight;
end; end;
function TRxDBGrid.getTitleRect(bRect: TRect): TRect; function TRxDBGrid.getTitleRect(bRect: TRect): TRect;
begin begin
Result := bRect; Result := bRect;
Result.Bottom := bRect.Bottom - DefaultRowHeight; if Assigned(FFilterListEditor) then
Result.Bottom := bRect.Bottom - FFilterListEditor.Height
else
Result.Bottom := bRect.Bottom - DefaultRowHeight;
end; end;
procedure TRxDBGrid.OutCaptionCellText(aCol, aRow: Integer;const aRect: TRect; procedure TRxDBGrid.OutCaptionCellText(aCol, aRow: Integer;const aRect: TRect;