From 8c0eb970d3205e5f13008a834b2e8ce8eb04dabf Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Sat, 12 Nov 2022 21:32:08 +0800
Subject: [PATCH] =?UTF-8?q?[feature][datazoom]=20=E5=A2=9E=E5=8A=A0`DataZo?=
 =?UTF-8?q?om`=E7=9A=84`MarqueeStyle`=E6=94=AF=E6=8C=81=E6=A1=86=E9=80=89?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Editor/MainComponents/DataZoomEditor.cs       |  4 ++--
 Runtime/Component/DataZoom/DataZoom.cs        | 13 +++++++------
 Runtime/Component/DataZoom/DataZoomHandler.cs |  8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Editor/MainComponents/DataZoomEditor.cs b/Editor/MainComponents/DataZoomEditor.cs
index 7f3ec005..fa85d49e 100644
--- a/Editor/MainComponents/DataZoomEditor.cs
+++ b/Editor/MainComponents/DataZoomEditor.cs
@@ -10,7 +10,7 @@ namespace XCharts.Editor
         {
             var m_SupportInside = baseProperty.FindPropertyRelative("m_SupportInside");
             var m_SupportSlider = baseProperty.FindPropertyRelative("m_SupportSlider");
-            var m_SupportSelect = baseProperty.FindPropertyRelative("m_SupportSelect");
+            var m_SupportMarquee = baseProperty.FindPropertyRelative("m_SupportMarquee");
             var m_Start = baseProperty.FindPropertyRelative("m_Start");
             var m_End = baseProperty.FindPropertyRelative("m_End");
             var m_MinShowNum = baseProperty.FindPropertyRelative("m_MinShowNum");
@@ -23,7 +23,7 @@ namespace XCharts.Editor
                 PropertyField("m_SupportInsideDrag");
             }
             PropertyField(m_SupportSlider);
-            PropertyField(m_SupportSelect);
+            PropertyField(m_SupportMarquee);
             PropertyField("m_ZoomLock");
             PropertyField("m_ScrollSensitivity");
             PropertyField("m_RangeMode");
diff --git a/Runtime/Component/DataZoom/DataZoom.cs b/Runtime/Component/DataZoom/DataZoom.cs
index 340cdf9f..2510191b 100644
--- a/Runtime/Component/DataZoom/DataZoom.cs
+++ b/Runtime/Component/DataZoom/DataZoom.cs
@@ -65,7 +65,7 @@ namespace XCharts.Runtime
         [SerializeField] private bool m_SupportInsideScroll = true;
         [SerializeField] private bool m_SupportInsideDrag = true;
         [SerializeField] private bool m_SupportSlider;
-        [SerializeField] private bool m_SupportSelect;
+        [SerializeField] private bool m_SupportMarquee;
         [SerializeField] private bool m_ShowDataShadow;
         [SerializeField] private bool m_ShowDetail;
         [SerializeField] private bool m_ZoomLock;
@@ -169,12 +169,13 @@ namespace XCharts.Runtime
             set { if (PropertyUtil.SetStruct(ref m_SupportSlider, value)) SetVerticesDirty(); }
         }
         /// <summary>
-        /// 是否支持框选。提供一个选框进行数据区域缩放。
+        /// Supported Box Selected. Provides a marquee for scaling the data area.
+        /// |是否支持框选。提供一个选框进行数据区域缩放。
         /// </summary>
-        public bool supportSelect
+        public bool supportMarquee
         {
-            get { return m_SupportSelect; }
-            set { if (PropertyUtil.SetStruct(ref m_SupportSelect, value)) SetVerticesDirty(); }
+            get { return m_SupportMarquee; }
+            set { if (PropertyUtil.SetStruct(ref m_SupportMarquee, value)) SetVerticesDirty(); }
         }
         /// <summary>
         /// Whether to show data shadow, to indicate the data tendency in brief.
@@ -534,7 +535,7 @@ namespace XCharts.Runtime
 
         public bool IsInMarqueeArea(Vector2 pos)
         {
-            if (!supportSelect) return false;
+            if (!supportMarquee) return false;
             return context.marqueeRect.Contains(pos);
         }
 
diff --git a/Runtime/Component/DataZoom/DataZoomHandler.cs b/Runtime/Component/DataZoom/DataZoomHandler.cs
index 9d9aa4bd..50f9f755 100644
--- a/Runtime/Component/DataZoom/DataZoomHandler.cs
+++ b/Runtime/Component/DataZoom/DataZoomHandler.cs
@@ -105,7 +105,7 @@ namespace XCharts.Runtime
                     dataZoom.context.isCoordinateDrag = true;
                 }
             }
-            if (dataZoom.supportSelect)
+            if (dataZoom.supportMarquee)
             {
                 dataZoom.context.isMarqueeDrag = true;
                 dataZoom.context.marqueeStartPos = pos;
@@ -155,7 +155,7 @@ namespace XCharts.Runtime
 
             var dataZoom = component;
             var grid = chart.GetGridOfDataZoom(dataZoom);
-            if (dataZoom.supportSelect)
+            if (dataZoom.supportMarquee)
             {
                 Vector2 pos;
                 if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
@@ -199,7 +199,7 @@ namespace XCharts.Runtime
 
             var dataZoom = component;
 
-            if (dataZoom.supportSelect)
+            if (dataZoom.supportMarquee)
             {
                 dataZoom.context.isMarqueeDrag = false;
                 if (dataZoom.marqueeStyle.apply)
@@ -676,7 +676,7 @@ namespace XCharts.Runtime
 
         private void DrawMarquee(VertexHelper vh, DataZoom dataZoom)
         {
-            if (!dataZoom.enable || !dataZoom.supportSelect)
+            if (!dataZoom.enable || !dataZoom.supportMarquee)
                 return;
             var areaColor = dataZoom.marqueeStyle.areaStyle.GetColor(chart.theme.dataZoom.dataAreaColor);
             UGL.DrawRectangle(vh, dataZoom.context.marqueeRect, areaColor);