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

删除Serie的MarkColor，增加ItemStyle的MarkColor

Browse Source
This commit is contained in:
monitor1394
2023-01-03 21:07:28 +08:00
parent a4aabb5bbe
commit 6ace71f8db
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Serie/Serie.cs
View File

@@ -230,7 +230,6 @@ namespace XCharts.Runtime
[SerializeField] private string m_SerieName;
[SerializeField][Since("v3.2.0")] private SerieState m_State = SerieState.Normal;
[SerializeField][Since("v3.2.0")] private SerieColorBy m_ColorBy = SerieColorBy.Default;
[SerializeField][Since("v3.4.0")] private Color32 m_MarkColor;
[SerializeField] private string m_Stack;
[SerializeField] private int m_XAxisIndex = 0;
[SerializeField] private int m_YAxisIndex = 0;
@@ -376,15 +375,6 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_ColorBy, value)) { SetAllDirty(); } }
}
/// <summary>
/// Serie's mark color. It is only used to display Legend and Tooltip, and does not affect the drawing color. The default value is clear.
/// |Serie的标识颜色。仅用于Legend和Tooltip的展示，不影响绘制颜色，默认为clear。
/// </summary>
public Color32 markColor
{
get { return m_MarkColor; }
set { if (PropertyUtil.SetStruct(ref m_MarkColor, value)) { SetAllDirty(); } }
}
/// <summary>
/// If stack the value. On the same category axis, the series with the same stack name would be put on top of each other.
/// |数据堆叠，同个类目轴上系列配置相同的stack值后，后一个系列的值会在前一个系列的值上相加。
/// </summary>

5
Runtime/Serie/SeriesHelper.cs
View File

@@ -106,7 +106,8 @@ namespace XCharts.Runtime
break;
}
}
if (ChartHelper.IsClearColor(destSerie.markColor))
var itemStyle = SerieHelper.GetItemStyle(destSerie, destSerieData, SerieState.Normal);
if (ChartHelper.IsClearColor(itemStyle.markColor))
{
Color32 color, toColor;
SerieHelper.GetItemColor(out color, out toColor, destSerie, destSerieData, chart.theme, index, SerieState.Normal);
@@ -114,7 +115,7 @@ namespace XCharts.Runtime
}
else
{
return destSerie.markColor;
return itemStyle.markColor;
}
}