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

修复Icon初始化异常的问题

Browse Source
This commit is contained in:
monitor1394
2019-10-13 16:03:47 +08:00
parent e2f2ea76fb
commit bbab8cb30d
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/XCharts/Scripts/UI/Internal/BaseChart.cs
View File

@@ -94,6 +94,7 @@ namespace XCharts
CheckTheme(); CheckTheme();
CheckTile(); CheckTile();
CheckLegend(); CheckLegend();
CheckPointerPos();
CheckTooltip(); CheckTooltip();
CheckRefreshChart(); CheckRefreshChart();
CheckRefreshLabel(); CheckRefreshLabel();
@@ -287,10 +288,10 @@ namespace XCharts
for (int i = 0; i < m_Series.Count; i++) for (int i = 0; i < m_Series.Count; i++)
{ {
var serie = m_Series.list[i]; var serie = m_Series.list[i];
if (serie.type != SerieType.Pie && !serie.label.show) continue;
for (int j = 0; j < serie.data.Count; j++) for (int j = 0; j < serie.data.Count; j++)
{ {
var serieData = serie.data[j]; var serieData = serie.data[j];
if (!serie.label.show && !serieData.showIcon) continue;
var textName = s_SerieLabelObjectName + "_" + i + "_" + j + "_" + serieData.name; var textName = s_SerieLabelObjectName + "_" + i + "_" + j + "_" + serieData.name;
var color = Color.grey; var color = Color.grey;
if (serie.type == SerieType.Pie) if (serie.type == SerieType.Pie)
@@ -398,6 +399,26 @@ namespace XCharts
} }
} }
private void CheckPointerPos()
{
var needCheck = (m_Tooltip.show && m_Tooltip.inited)
|| raycastTarget;
if (needCheck)
{
if (canvas == null) return;
Vector2 local;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
Input.mousePosition, canvas.worldCamera, out local))
{
pointerPos = Vector2.zero;
}
else
{
pointerPos = local;
}
}
}
private void CheckTooltip() private void CheckTooltip()
{ {
if (!m_Tooltip.show || !m_Tooltip.inited) if (!m_Tooltip.show || !m_Tooltip.inited)
@@ -414,11 +435,10 @@ namespace XCharts
{ {
m_Tooltip.dataIndex[i] = -1; m_Tooltip.dataIndex[i] = -1;
} }
Vector2 local; Vector2 local = pointerPos;
if (canvas == null) return; if (canvas == null) return;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, if (local == Vector2.zero)
Input.mousePosition, canvas.worldCamera, out local))
{ {
if (m_Tooltip.IsActive()) if (m_Tooltip.IsActive())
{ {