From bbab8cb30d12bfc5f3f31d3fdffbfb283223a6b9 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Sun, 13 Oct 2019 16:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIcon=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XCharts/Scripts/UI/Internal/BaseChart.cs  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs b/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs
index 0b991aa1..6ec68714 100644
--- a/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs
+++ b/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs
@@ -94,6 +94,7 @@ namespace XCharts
             CheckTheme();
             CheckTile();
             CheckLegend();
+            CheckPointerPos();
             CheckTooltip();
             CheckRefreshChart();
             CheckRefreshLabel();
@@ -287,10 +288,10 @@ namespace XCharts
             for (int i = 0; i < m_Series.Count; 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++)
                 {
                     var serieData = serie.data[j];
+                    if (!serie.label.show && !serieData.showIcon) continue;
                     var textName = s_SerieLabelObjectName + "_" + i + "_" + j + "_" + serieData.name;
                     var color = Color.grey;
                     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()
         {
             if (!m_Tooltip.show || !m_Tooltip.inited)
@@ -414,11 +435,10 @@ namespace XCharts
             {
                 m_Tooltip.dataIndex[i] = -1;
             }
-            Vector2 local;
+            Vector2 local = pointerPos;
             if (canvas == null) return;
 
-            if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
-                Input.mousePosition, canvas.worldCamera, out local))
+            if (local == Vector2.zero)
             {
                 if (m_Tooltip.IsActive())
                 {