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

LazReport, fix exporting line's frames

Browse Source 
git-svn-id: trunk@21632 -
This commit is contained in:
jesus 2009-09-09 01:10:50 +00:00
parent a20ae1765a
commit f0f61ca003
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/lazreport/source/lr_class.pas
View File

@ -239,6 +239,7 @@ type
procedure BeforeChange; procedure BeforeChange;
procedure AfterChange; procedure AfterChange;
procedure ResetLastValue; virtual; procedure ResetLastValue; virtual;
function GetFrames: TfrFrameBorders; virtual;
public public
Parent: TfrBand; Parent: TfrBand;
ID: Integer; ID: Integer;
@ -279,7 +280,7 @@ type
property FillColor : TColor read fFillColor write SetFillColor; property FillColor : TColor read fFillColor write SetFillColor;
property Stretched : Boolean read GetStretched write SetStretched; property Stretched : Boolean read GetStretched write SetStretched;
property Frames : TfrFrameBorders read fFrames write SetFrames; property Frames : TfrFrameBorders read GetFrames write SetFrames;
property FrameColor : TColor read fFrameColor write SetFrameColor; property FrameColor : TColor read fFrameColor write SetFrameColor;
property FrameStyle : TfrFrameStyle read fFrameStyle write SetFrameStyle; property FrameStyle : TfrFrameStyle read fFrameStyle write SetFrameStyle;
property FrameWidth : Double read fFrameWidth write SetFrameWidth; property FrameWidth : Double read fFrameWidth write SetFrameWidth;
@ -487,7 +488,11 @@ type
property Stretched; property Stretched;
end; end;
{ TfrLineView }
TfrLineView = class(TfrView) TfrLineView = class(TfrView)
protected
function GetFrames: TfrFrameBorders; override;
public public
constructor Create; override; constructor Create; override;
@ -2095,6 +2100,11 @@ begin
result := dy; result := dy;
end; end;
function TfrView.GetFrames: TfrFrameBorders;
begin
result := fFrames;
end;
function TfrView.GetTop: Double; function TfrView.GetTop: Double;
begin begin
if frDesigner<>nil then if frDesigner<>nil then
@ -4308,6 +4318,21 @@ begin
Result := '(' + Result + ')|'+Result; Result := '(' + Result + ')|'+Result;
end; end;
function TfrLineView.GetFrames: TfrFrameBorders;
begin
if dx > dy then
begin
dy := 0;
fFrames:=[frbTop];
end
else
begin
dx := 0;
fFrames:=[frbLeft];
end;
Result:=fFrames;
end;
{----------------------------------------------------------------------------} {----------------------------------------------------------------------------}
constructor TfrLineView.Create; constructor TfrLineView.Create;
begin begin
@ -4320,16 +4345,7 @@ end;
procedure TfrLineView.Draw(aCanvas: TCanvas); procedure TfrLineView.Draw(aCanvas: TCanvas);
begin begin
BeginDraw(aCanvas); BeginDraw(aCanvas);
if dx > dy then GetFrames;
begin
dy := 0;
fFrames:=[frbTop];
end
else
begin
dx := 0;
fFrames:=[frbLeft];
end;
CalcGaps; CalcGaps;
ShowFrame; ShowFrame;
RestoreCoord; RestoreCoord;