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

RxFPC:RxDBGrid - move property DrawFullLine to RxDBGrid.FooterOptions

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4638 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-05-05 06:49:18 +00:00
parent fdbf8a6f0b
commit 6b38f2d82b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/rx/trunk/rxdbgrid.pas
View File

@ -820,7 +820,7 @@ type
property BorderStyle; property BorderStyle;
property Color; property Color;
property BorderColor; property BorderColor;
property DrawFullLine: boolean read GetDrawFullLine write SetDrawFullLine; property DrawFullLine: boolean read GetDrawFullLine write SetDrawFullLine; deprecated;
property FocusColor; property FocusColor;
property FixedHotColor; property FixedHotColor;
@ -1870,6 +1870,7 @@ procedure TRxDBGridFooterOptions.SetDrawFullLine(AValue: boolean);
begin begin
if FDrawFullLine=AValue then Exit; if FDrawFullLine=AValue then Exit;
FDrawFullLine:=AValue; FDrawFullLine:=AValue;
FOwner.VisualChange;
end; end;
procedure TRxDBGridFooterOptions.SetRowCount(AValue: integer); procedure TRxDBGridFooterOptions.SetRowCount(AValue: integer);
@ -2448,13 +2449,12 @@ end;
function TRxDBGrid.GetDrawFullLine: boolean; function TRxDBGrid.GetDrawFullLine: boolean;
begin begin
Result := FDrawFullLine; Result := FFooterOptions.FDrawFullLine;
end; end;
procedure TRxDBGrid.SetDrawFullLine(Value: boolean); procedure TRxDBGrid.SetDrawFullLine(Value: boolean);
begin begin
FDrawFullLine := Value; FFooterOptions.DrawFullLine := Value;
VisualChange;
end; end;
procedure TRxDBGrid.DoCreateJMenu; procedure TRxDBGrid.DoCreateJMenu;
@ -3946,7 +3946,7 @@ begin
begin begin
TxS := Canvas.TextStyle; TxS := Canvas.TextStyle;
if FDrawFullLine then if FFooterOptions.FDrawFullLine then
begin begin
ColRowToOffset(True, True, 0, R.Left, R.Right); ColRowToOffset(True, True, 0, R.Left, R.Right);
Canvas.Pen.Color := GridLineColor; Canvas.Pen.Color := GridLineColor;
@ -3969,7 +3969,7 @@ begin
Canvas.FillRect(R); Canvas.FillRect(R);
DrawCellGrid(i, 0, R, []); DrawCellGrid(i, 0, R, []);
if FDrawFullLine then if FFooterOptions.FDrawFullLine then
begin begin
Canvas.MoveTo(R.Right - 1, R.Top); Canvas.MoveTo(R.Right - 1, R.Top);
Canvas.LineTo(R.Right - 1, RowHeights[0]); Canvas.LineTo(R.Right - 1, RowHeights[0]);
@ -4024,7 +4024,7 @@ begin
if assigned(ABrush)then FreeAndNil(ABrush); if assigned(ABrush)then FreeAndNil(ABrush);
if FDrawFullLine then if FFooterOptions.FDrawFullLine then
begin begin
Canvas.MoveTo(FooterRect.Left, FooterRect.Top); Canvas.MoveTo(FooterRect.Left, FooterRect.Top);
Canvas.LineTo(R.Right, FooterRect.Top); Canvas.LineTo(R.Right, FooterRect.Top);

2
components/rx/trunk/rxfileutils.pas
View File

@ -45,8 +45,8 @@ function GetUserName:string;
implementation implementation
uses
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
uses
Windows; Windows;
{$ELSE} {$ELSE}
{$ENDIF} {$ENDIF}