From 811f3994dd4c47b12536a8da91020e3fd5e8a76a Mon Sep 17 00:00:00 2001 From: wp_xyz Date: Sun, 24 Oct 2021 11:29:29 +0200 Subject: [PATCH] TAChart/ChartEditor: Use new TLegendClickTool.OnSeriesClick event rather than .OnLegendClick --- components/tachart/demo/charteditor/cemain.lfm | 8 ++++---- components/tachart/demo/charteditor/cemain.pas | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/components/tachart/demo/charteditor/cemain.lfm b/components/tachart/demo/charteditor/cemain.lfm index c149d27305..466e255e8f 100644 --- a/components/tachart/demo/charteditor/cemain.lfm +++ b/components/tachart/demo/charteditor/cemain.lfm @@ -105,7 +105,7 @@ object MainForm: TMainForm Left = 6 Height = 19 Top = 321 - Width = 177 + Width = 175 Anchors = [akLeft, akBottom] BorderSpacing.Left = 6 BorderSpacing.Bottom = 6 @@ -117,10 +117,10 @@ object MainForm: TMainForm AnchorSideLeft.Control = cbDoubleClick AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbDoubleClick - Left = 207 + Left = 205 Height = 19 Top = 321 - Width = 140 + Width = 138 BorderSpacing.Left = 24 Caption = 'Use "all-in-one" dialog' TabOrder = 2 @@ -138,7 +138,7 @@ object MainForm: TMainForm end object ChartToolset1LegendClickTool1: TLegendClickTool Shift = [ssLeft] - OnClick = ChartToolset1LegendClickTool1Click + OnSeriesClick = ChartToolset1LegendClickTool1SeriesClick end object ChartToolset1AxisClickTool1: TAxisClickTool Shift = [ssLeft] diff --git a/components/tachart/demo/charteditor/cemain.pas b/components/tachart/demo/charteditor/cemain.pas index d8f66d1591..18683e389b 100644 --- a/components/tachart/demo/charteditor/cemain.pas +++ b/components/tachart/demo/charteditor/cemain.pas @@ -46,8 +46,8 @@ type Axis: TChartAxis; AHit: TChartAxisHitTests); procedure ChartToolset1DataPointClickTool1PointClick(ATool: TChartTool; APoint: TPoint); - procedure ChartToolset1LegendClickTool1Click(ASender: TChartTool; - ALegend: TChartLegend); + procedure ChartToolset1LegendClickTool1SeriesClick(ASender: TChartTool; + ALegend: TChartLegend; ASeries: TBasicChartSeries); procedure ChartToolset1TitleFootClickTool1Click(ASender: TChartTool; ATitle: TChartTitle); procedure cbDoubleClickChange(Sender: TObject); @@ -172,11 +172,14 @@ begin EditSeries(TDataPointClickTool(ATool).Series); end; -procedure TMainForm.ChartToolset1LegendClickTool1Click(ASender: TChartTool; - ALegend: TChartLegend); +procedure TMainForm.ChartToolset1LegendClickTool1SeriesClick( + ASender: TChartTool; ALegend: TChartLegend; ASeries: TBasicChartSeries); begin Unused(ASender); - EditLegend(ALegend); + if ASeries = nil then + EditLegend(ALegend) + else + EditSeries(ASeries); end; procedure TMainForm.EditAxis(AAxis: TChartAxis; APage: TChartAxisEditorPage);