[optimaze][background] rename hideThemeBackgroundColor to autoColor

This commit is contained in:
monitor1394
2022-06-14 07:01:46 +08:00
parent 0880b2f3f9
commit e8c46b676f
5 changed files with 20 additions and 10 deletions

View File

@@ -18,7 +18,7 @@ namespace XCharts.Runtime
[SerializeField] private Sprite m_Image;
[SerializeField] private Image.Type m_ImageType;
[SerializeField] private Color m_ImageColor = Color.white;
[SerializeField] private bool m_HideThemeBackgroundColor = true;
[SerializeField] private bool m_AutoColor = true;
/// <summary>
/// Whether to enable the background component.
@@ -59,13 +59,13 @@ namespace XCharts.Runtime
}
/// <summary>
/// Whether to hide the background color set in the theme when the background component is on.
/// |当background组件开启时是否隐藏主题中设置的背景色。
/// Whether to use theme background color for component color when the background component is on.
/// |当background组件开启时是否自动使用主题背景色作为backgrounnd组件的颜色。当设置为false时用imageColor作为颜色。
/// </summary>
public bool hideThemeBackgroundColor
public bool autoColor
{
get { return m_HideThemeBackgroundColor; }
set { if (PropertyUtil.SetStruct(ref m_HideThemeBackgroundColor, value)) SetVerticesDirty(); }
get { return m_AutoColor; }
set { if (PropertyUtil.SetStruct(ref m_AutoColor, value)) SetVerticesDirty(); }
}
public override void SetDefaultValue()
@@ -74,7 +74,7 @@ namespace XCharts.Runtime
m_Image = null;
m_ImageType = Image.Type.Sliced;
m_ImageColor = Color.white;
m_HideThemeBackgroundColor = true;
m_AutoColor = true;
}
}
}

View File

@@ -24,7 +24,7 @@ namespace XCharts.Runtime
chart.chartMaxAnchor, chart.chartPivot, chart.chartSizeDelta);
backgroundImage.sprite = component.image;
backgroundImage.type = component.imageType;
backgroundImage.color = component.imageColor;
backgroundImage.color = chart.theme.GetBackgroundColor(component);
backgroundObj.transform.SetSiblingIndex(0);
backgroundObj.SetActive(component.show);
@@ -32,10 +32,18 @@ namespace XCharts.Runtime
component.refreshComponent();
}
public override void Update()
{
if (component.gameObject != null && component.gameObject.transform.GetSiblingIndex() != 0)
component.gameObject.transform.SetSiblingIndex(0);
}
public override void DrawBase(VertexHelper vh)
{
if (!component.show)
return;
if (component.image != null)
return;
var p1 = new Vector3(chart.chartX, chart.chartY + chart.chartHeight);
var p2 = new Vector3(chart.chartX + chart.chartWidth, chart.chartY + chart.chartHeight);