From 301c66eccf27739f6069f6919796c7d26b43dec8 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 23 Dec 2024 21:29:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=96=E6=8B=BD=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Internal/BaseChart.Draw.cs | 4 ++-- Runtime/Internal/BaseGraph.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Runtime/Internal/BaseChart.Draw.cs b/Runtime/Internal/BaseChart.Draw.cs index f23303be..c9f2247b 100644 --- a/Runtime/Internal/BaseChart.Draw.cs +++ b/Runtime/Internal/BaseChart.Draw.cs @@ -54,8 +54,8 @@ namespace XCharts.Runtime p4 = ClampInGrid(grid, p4); } if (!clip || - (clip && (grid.Contains(p1) && grid.Contains(p2) && grid.Contains(p3) && - grid.Contains(p4)))) + (clip && grid.Contains(p1) && grid.Contains(p2) && grid.Contains(p3) && + grid.Contains(p4))) UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, startColor, toColor); } diff --git a/Runtime/Internal/BaseGraph.cs b/Runtime/Internal/BaseGraph.cs index 23de7149..8f0f7659 100644 --- a/Runtime/Internal/BaseGraph.cs +++ b/Runtime/Internal/BaseGraph.cs @@ -54,9 +54,11 @@ namespace XCharts.Runtime public virtual HideFlags chartHideFlags { get { return HideFlags.None; } } private ScrollRect m_ScrollRect; + private Vector2 m_PointerDownPos; public Painter painter { get { return m_Painter; } } public List childrenNodeNames { get { return m_ChildNodeNames; } } + public bool isDragingClick { get; set; } protected virtual void InitComponent() { @@ -287,11 +289,13 @@ namespace XCharts.Runtime public virtual void OnPointerDown(PointerEventData eventData) { + m_PointerDownPos = eventData.position; if (m_OnPointerDown != null) m_OnPointerDown(eventData, this); } public virtual void OnPointerUp(PointerEventData eventData) { + isDragingClick = Vector2.Distance(eventData.position, m_PointerDownPos) > 6; if (m_OnPointerUp != null) m_OnPointerUp(eventData, this); }