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

Merged revision(s) 57238-57239 #703d842627-#703d842627 from trunk:

Browse Source 
TAChart: Fix brush style bsClear not working in TClearBrush
........
TAChart: Fix ZoomDragTool ignoring its Frame.Visible setting.
........

git-svn-id: branches/fixes_1_8@57260 -
This commit is contained in:
maxim 2018-02-05 22:22:03 +00:00
parent f73c372d7d
commit c383a8c927
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/tachart/tatools.pas
View File

@ -873,6 +873,9 @@ procedure TChartTool.PrepareDrawingModePen(
begin
ADrawer.SetXor(EffectiveDrawingMode = tdmXor);
ADrawer.Pen := APen;
if (APen is TChartPen) then
if not TChartPen(APen).EffVisible then
ADrawer.SetPenParams(psClear, TChartPen(APen).Color);
end;
procedure TChartTool.ReadState(Reader: TReader);

14
components/tachart/tatypes.pas
View File

@ -63,8 +63,12 @@ type
end;
TClearBrush = class(TBrush)
public
constructor Create; override;
published
property Style default bsClear;
// property Style default bsClear;
{ wp: Removed because bsClear would no longer work - TBrush.SetColor switches
Style to clSolid if Style is bsClear }
end;
TFPCanvasHelperClass = class of TFPCanvasHelper;
@ -296,6 +300,14 @@ begin
if Assigned(OnChange) then OnChange(Self);
end;
{ TClearBrush }
constructor TClearBrush.Create;
begin
inherited;
Style := bsClear;
end;
{ TChartElement }
procedure TChartElement.Assign(ASource: TPersistent);