From 8fad3b0f712cf2d67350ccc29520fbd814d13351 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Fri, 20 Sep 2019 08:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTooltip=E5=9C=A8=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=87=BA=E5=9B=BE=E8=A1=A8=E5=A4=96=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E7=BB=98=E5=88=B6=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/UI/Internal/BaseChart.cs       | 18 ++++++++++++------
 Scripts/UI/Internal/CoordinateChart.cs |  9 +++++++--
 Scripts/UI/PieChart.cs                 |  3 ++-
 Scripts/UI/RadarChart.cs               |  6 +++++-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Scripts/UI/Internal/BaseChart.cs b/Scripts/UI/Internal/BaseChart.cs
index b2ca7fab..49dbf3c5 100644
--- a/Scripts/UI/Internal/BaseChart.cs
+++ b/Scripts/UI/Internal/BaseChart.cs
@@ -381,9 +381,9 @@ namespace XCharts
         {
             if (!m_Tooltip.show || !m_Tooltip.inited)
             {
-                if (m_Tooltip.dataIndex[0] != 0 || m_Tooltip.dataIndex[1] != 0)
+                if (m_Tooltip.IsActive())
                 {
-                    m_Tooltip.dataIndex[0] = m_Tooltip.dataIndex[1] = -1;
+                    m_Tooltip.ClearValue();
                     m_Tooltip.SetActive(false);
                     RefreshChart();
                 }
@@ -399,15 +399,21 @@ namespace XCharts
             if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
                 Input.mousePosition, canvas.worldCamera, out local))
             {
-                if (m_Tooltip.IsActive()) RefreshChart();
-                m_Tooltip.SetActive(false);
+                if (m_Tooltip.IsActive())
+                {
+                    m_Tooltip.SetActive(false);
+                    RefreshChart();
+                }
                 return;
             }
             if (local.x < 0 || local.x > chartWidth ||
                 local.y < 0 || local.y > chartHeight)
             {
-                if (m_Tooltip.IsActive()) RefreshChart();
-                m_Tooltip.SetActive(false);
+                if (m_Tooltip.IsActive())
+                {
+                    m_Tooltip.SetActive(false);
+                    RefreshChart();
+                }
                 return;
             }
             m_Tooltip.pointerPos = local;
diff --git a/Scripts/UI/Internal/CoordinateChart.cs b/Scripts/UI/Internal/CoordinateChart.cs
index df380081..44b23f79 100644
--- a/Scripts/UI/Internal/CoordinateChart.cs
+++ b/Scripts/UI/Internal/CoordinateChart.cs
@@ -162,9 +162,10 @@ namespace XCharts
                     RefreshChart();
                 }
             }
-            else
+            else if (m_Tooltip.IsActive())
             {
                 m_Tooltip.SetActive(false);
+                RefreshChart();
             }
         }
 
@@ -192,7 +193,11 @@ namespace XCharts
             }
             if (index < 0)
             {
-                m_Tooltip.SetActive(false);
+                if (m_Tooltip.IsActive())
+                {
+                    m_Tooltip.SetActive(false);
+                    RefreshChart();
+                }
                 return;
             }
 
diff --git a/Scripts/UI/PieChart.cs b/Scripts/UI/PieChart.cs
index babfb8a4..b03d706b 100644
--- a/Scripts/UI/PieChart.cs
+++ b/Scripts/UI/PieChart.cs
@@ -519,9 +519,10 @@ namespace XCharts
                 m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25));
                 RefreshTooltip();
             }
-            else
+            else if(m_Tooltip.IsActive())
             {
                 m_Tooltip.SetActive(false);
+                RefreshChart();
             }
         }
 
diff --git a/Scripts/UI/RadarChart.cs b/Scripts/UI/RadarChart.cs
index 76771e20..1ac39d52 100644
--- a/Scripts/UI/RadarChart.cs
+++ b/Scripts/UI/RadarChart.cs
@@ -472,7 +472,11 @@ namespace XCharts
             int serieIndex = m_Tooltip.dataIndex[0];
             if (serieIndex < 0)
             {
-                m_Tooltip.SetActive(false);
+                if (m_Tooltip.IsActive())
+                {
+                    m_Tooltip.SetActive(false);
+                    RefreshChart();
+                }
                 return;
             }
             m_Tooltip.SetActive(true);