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

增加Tooltip指示器类型，优化显示控制

Browse Source
This commit is contained in:
monitor1394
2019-07-18 09:42:36 +08:00
parent f9a853dee4
commit 9ed5c5b277
15 changed files with 52998 additions and 217127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ namespace XCharts
Vertical
}
public class BaseChart : MaskableGraphic, IPointerDownHandler, IPointerUpHandler,
public class BaseChart : Graphic, IPointerDownHandler, IPointerUpHandler,
IPointerEnterHandler, IPointerExitHandler, IBeginDragHandler,
IDragHandler, IEndDragHandler, IScrollHandler
{
@@ -232,7 +232,7 @@ namespace XCharts
/// <returns>True when activated</returns>
public virtual bool IsActive(int serieIndex)
{
return m_Legend.IsActive(serieIndex) || m_Series.IsActive(serieIndex);
return m_Legend.IsActive(serieIndex) && m_Series.IsActive(serieIndex);
}
/// <summary>
@@ -284,6 +284,18 @@ namespace XCharts
CheckRefreshChart();
}
protected override void OnEnable()
{
base.OnEnable();
Awake();
}
protected override void OnDisable()
{
base.OnDisable();
ChartHelper.DestoryAllChilds(transform);
}
#if UNITY_EDITOR
protected override void Reset()
{
@@ -453,17 +465,18 @@ namespace XCharts
{
if (!m_Tooltip.show || !m_Tooltip.isInited)
{
if (m_Tooltip.dataIndex != 0)
if (m_Tooltip.dataIndex[0] != 0 || m_Tooltip.dataIndex[1] != 0)
{
m_Tooltip.dataIndex = 0;
m_Tooltip.dataIndex[0] = m_Tooltip.dataIndex[1] = -1;
m_Tooltip.SetActive(false);
RefreshChart();
}
return;
}
m_Tooltip.dataIndex = 0;
m_Tooltip.dataIndex[0] = m_Tooltip.dataIndex[1] = -1;
Vector2 local;
if (canvas == null) return;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
Input.mousePosition, canvas.worldCamera, out local))