foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-25 02:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pie chart fade out animation #168

Browse Source
This commit is contained in:
monitor1394
2021-09-07 21:44:05 +08:00
parent 7f4154b1db
commit 4ad4eef4a3
4 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-EN.md
View File

@@ -40,6 +40,7 @@
## master ## master
* (2021.09.07) Fixed bug where `label` does not disappear at the end of `PieChart` fade animation #168
* (2021.09.06) Fixed bug where `GaugeChart` changing `splitNumber` with code does not refresh `label` #167 * (2021.09.06) Fixed bug where `GaugeChart` changing `splitNumber` with code does not refresh `label` #167
## v2.4.0 ## v2.4.0

1
CHANGELOG.md
View File

@@ -40,6 +40,7 @@
## master ## master
* (2021.09.07) 修复`PieChart`渐出动画结束时`label`没有消失的问题 #168
* (2021.09.06) 修复`GaugeChart`用代码改变`splitNumber`不会刷新`label`的问题 #167 * (2021.09.06) 修复`GaugeChart`用代码改变`splitNumber`不会刷新`label`的问题 #167
## v2.4.0 ## v2.4.0

1
Runtime/Internal/BaseChart.cs
View File

@@ -546,6 +546,7 @@ namespace XCharts
var iconStyle = SerieHelper.GetIconStyle(serie, serieData); var iconStyle = SerieHelper.GetIconStyle(serie, serieData);
if (serie.IsPerformanceMode()) return; if (serie.IsPerformanceMode()) return;
if (!serieLabel.show && !iconStyle.show) return; if (!serieLabel.show && !iconStyle.show) return;
if(serie.animation.enable && serie.animation.HasFadeOut()) return;
var textName = ChartCached.GetSerieLabelName(s_SerieLabelObjectName, serie.index, serieData.index); var textName = ChartCached.GetSerieLabelName(s_SerieLabelObjectName, serie.index, serieData.index);
var color = Color.grey; var color = Color.grey;
if (serie.type == SerieType.Pie) if (serie.type == SerieType.Pie)

2
Runtime/Internal/DrawSeriePie.cs
View File

@@ -413,6 +413,7 @@ namespace XCharts
private void DrawPieLabelLine(VertexHelper vh, Serie serie, SerieData serieData, Color color) private void DrawPieLabelLine(VertexHelper vh, Serie serie, SerieData serieData, Color color)
{ {
if (serie.animation.enable && serie.animation.HasFadeOut()) return;
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData); var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
if (serieLabel.show if (serieLabel.show
&& serieLabel.position == SerieLabel.Position.Outside && serieLabel.position == SerieLabel.Position.Outside
@@ -496,6 +497,7 @@ namespace XCharts
private void DrawPieLabel(Serie serie, int dataIndex, SerieData serieData, Color serieColor) private void DrawPieLabel(Serie serie, int dataIndex, SerieData serieData, Color serieColor)
{ {
if (serieData.labelObject == null) return; if (serieData.labelObject == null) return;
if (serie.animation.enable && serie.animation.HasFadeOut()) return;
var currAngle = serieData.runtimePieHalfAngle; var currAngle = serieData.runtimePieHalfAngle;
var isHighlight = (serieData.highlighted && serie.emphasis.label.show); var isHighlight = (serieData.highlighted && serie.emphasis.label.show);
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData); var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);