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

优化Theme主题的自定义，切换主题时自定义配置不受影响

Browse Source
This commit is contained in:
monitor1394
2019-07-24 09:41:27 +08:00
parent cb6d0765ca
commit 78123b74ae
7 changed files with 13373 additions and 10923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/UI/Internal/BaseChart.cs
View File

@@ -21,7 +21,6 @@ namespace XCharts
[SerializeField] protected float m_ChartWidth;
[SerializeField] protected float m_ChartHeight;
[SerializeField] protected Theme m_Theme = Theme.Default;
[SerializeField] protected ThemeInfo m_ThemeInfo;
[SerializeField] protected Title m_Title = Title.defaultTitle;
[SerializeField] protected Legend m_Legend = Legend.defaultLegend;
@@ -291,7 +290,7 @@ namespace XCharts
/// <param name="theme">theme</param>
public void UpdateTheme(Theme theme)
{
this.m_Theme = theme;
m_ThemeInfo.theme = theme;
OnThemeChanged();
RefreshChart();
}
@@ -310,7 +309,7 @@ namespace XCharts
m_ChartHeight = rectTransform.sizeDelta.y;
m_CheckWidth = m_ChartWidth;
m_CheckHeight = m_ChartHeight;
m_CheckTheme = m_Theme;
m_CheckTheme = m_ThemeInfo.theme;
InitTitle();
InitLegend();
InitTooltip();
@@ -495,9 +494,9 @@ namespace XCharts
private void CheckTheme()
{
if (m_CheckTheme != m_Theme)
if (m_CheckTheme != m_ThemeInfo.theme)
{
m_CheckTheme = m_Theme;
m_CheckTheme = m_ThemeInfo.theme;
OnThemeChanged();
}
}
@@ -596,7 +595,7 @@ namespace XCharts
protected virtual void OnThemeChanged()
{
switch (m_Theme)
switch (m_ThemeInfo.theme)
{
case Theme.Dark:
m_ThemeInfo.Copy(ThemeInfo.Dark);