From 4de87fd3582fd3db5e5423e5cb250ce9c29752e2 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 18 May 2021 09:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTooltip=E4=B8=8D=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs | 2 +- Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs | 2 +- Assets/XCharts/Runtime/Internal/DrawSeriePie.cs | 2 +- Assets/XCharts/Runtime/Internal/DrawSerieRadar.cs | 2 +- Assets/XCharts/Runtime/Internal/DrawSerieRing.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs b/Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs index 14945037..fb1a3790 100644 --- a/Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs +++ b/Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs @@ -322,7 +322,7 @@ namespace XCharts { drawRect.width = drawRect.width - 18; EditorGUI.PropertyField(drawRect, element, new GUIContent("Element " + index)); - drawRect.x = currentWidth - 45; + drawRect.x = currentWidth - 40; EditorGUI.PropertyField(drawRect, selected, GUIContent.none); drawRect.x = lastX; drawRect.width = lastWid; diff --git a/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs b/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs index 41e8945d..62883e10 100644 --- a/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs +++ b/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs @@ -79,7 +79,7 @@ namespace XCharts public bool CheckTootipArea(Vector2 local) { - if (chart.series.Contains(SerieType.Gauge)) return false; + if (!chart.series.Contains(SerieType.Gauge)) return false; var serie = GetPointerInSerieIndex(chart.series, local); if (serie != null) { diff --git a/Assets/XCharts/Runtime/Internal/DrawSeriePie.cs b/Assets/XCharts/Runtime/Internal/DrawSeriePie.cs index aa5f3f1a..657eef01 100644 --- a/Assets/XCharts/Runtime/Internal/DrawSeriePie.cs +++ b/Assets/XCharts/Runtime/Internal/DrawSeriePie.cs @@ -75,7 +75,7 @@ namespace XCharts public bool CheckTootipArea(Vector2 local) { - if (chart.series.Contains(SerieType.Pie)) return false; + if (!chart.series.Contains(SerieType.Pie)) return false; bool selected = false; chart.tooltip.runtimeDataIndex.Clear(); foreach (var serie in chart.series.list) diff --git a/Assets/XCharts/Runtime/Internal/DrawSerieRadar.cs b/Assets/XCharts/Runtime/Internal/DrawSerieRadar.cs index 0a0525f0..e522e933 100644 --- a/Assets/XCharts/Runtime/Internal/DrawSerieRadar.cs +++ b/Assets/XCharts/Runtime/Internal/DrawSerieRadar.cs @@ -119,7 +119,7 @@ namespace XCharts public bool CheckTootipArea(Vector2 local) { - if (chart.series.Contains(SerieType.Radar)) return false; + if (!chart.series.Contains(SerieType.Radar)) return false; if (m_IsEnterLegendButtom) return false; if (!IsInRadar(local)) return false; bool highlight = false; diff --git a/Assets/XCharts/Runtime/Internal/DrawSerieRing.cs b/Assets/XCharts/Runtime/Internal/DrawSerieRing.cs index 9b5b7d74..5c39b5cb 100644 --- a/Assets/XCharts/Runtime/Internal/DrawSerieRing.cs +++ b/Assets/XCharts/Runtime/Internal/DrawSerieRing.cs @@ -127,7 +127,7 @@ namespace XCharts public bool CheckTootipArea(Vector2 local) { - if (chart.series.Contains(SerieType.Ring)) return false; + if (!chart.series.Contains(SerieType.Ring)) return false; if (!PointerIsInRingSerie(chart.series, local)) return false; if (m_IsEnterLegendButtom) return false; bool selected = false;