From 2431a001b19473be7f6cffac687b014b7413bd05 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Sat, 16 Dec 2023 22:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96border?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Component/Child/ItemStyle.cs | 12 ------------ Runtime/Internal/Pools/ListPool.cs | 2 +- Runtime/Serie/Bar/BarHandler.cs | 2 +- Runtime/Serie/Bar/SimplifiedBarHandler.cs | 4 ++-- Runtime/Serie/Candlestick/CandlestickHandler.cs | 4 ++-- .../Candlestick/SimplifiedCandlestickHandler.cs | 4 ++-- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Runtime/Component/Child/ItemStyle.cs b/Runtime/Component/Child/ItemStyle.cs index b9712fb7..69384b9b 100644 --- a/Runtime/Component/Child/ItemStyle.cs +++ b/Runtime/Component/Child/ItemStyle.cs @@ -228,18 +228,6 @@ namespace XCharts.Runtime get { return m_CornerRadius; } set { if (PropertyUtil.SetClass(ref m_CornerRadius, value, true)) SetVerticesDirty(); } } - /// - /// 实际边框宽。边框不显示时为0。 - /// - public float runtimeBorderWidth { get { return NeedShowBorder() ? borderWidth : 0; } } - - /// - /// 是否需要显示边框。 - /// - public bool NeedShowBorder() - { - return borderWidth != 0 && !ChartHelper.IsClearColor(borderColor); - } public Color32 GetColor() { diff --git a/Runtime/Internal/Pools/ListPool.cs b/Runtime/Internal/Pools/ListPool.cs index 8210fde1..37efc522 100644 --- a/Runtime/Internal/Pools/ListPool.cs +++ b/Runtime/Internal/Pools/ListPool.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; namespace XCharts.Runtime { - internal static class ListPool + public static class ListPool { private static readonly ObjectPool> s_ListPool = new ObjectPool>(OnGet, OnClear); static void OnGet(List l) diff --git a/Runtime/Serie/Bar/BarHandler.cs b/Runtime/Serie/Bar/BarHandler.cs index caf57f6c..7f4ad259 100644 --- a/Runtime/Serie/Bar/BarHandler.cs +++ b/Runtime/Serie/Bar/BarHandler.cs @@ -218,7 +218,7 @@ namespace XCharts.Runtime var itemStyle = SerieHelper.GetItemStyle(serie, serieData, state); var value = axis.IsCategory() ? i : serieData.GetData(0, axis.inverse); var relativedValue = serieData.GetCurrData(1, dataAddDuration, dataChangeDuration, relativedAxis.inverse, 0, 0, serie.animation.unscaledTime); - var borderWidth = relativedValue == 0 ? 0 : itemStyle.runtimeBorderWidth; + var borderWidth = relativedValue == 0 ? 0 : itemStyle.borderWidth; var borderGap = relativedValue == 0 ? 0 : itemStyle.borderGap; var borderGapAndWidth = borderWidth + borderGap; var backgroundColor = itemStyle.backgroundColor; diff --git a/Runtime/Serie/Bar/SimplifiedBarHandler.cs b/Runtime/Serie/Bar/SimplifiedBarHandler.cs index f98576d3..1d2884e5 100644 --- a/Runtime/Serie/Bar/SimplifiedBarHandler.cs +++ b/Runtime/Serie/Bar/SimplifiedBarHandler.cs @@ -162,7 +162,7 @@ namespace XCharts.Runtime var itemStyle = SerieHelper.GetItemStyle(serie, serieData); var value = axis.IsCategory() ? i : serieData.GetData(0, axis.inverse); var relativedValue = serieData.GetCurrData(1, dataAddDuration, dataChangeDuration, relativedAxis.inverse, 0, 0, serie.animation.unscaledTime); - var borderWidth = relativedValue == 0 ? 0 : itemStyle.runtimeBorderWidth; + var borderWidth = relativedValue == 0 ? 0 : itemStyle.borderWidth; if (!serieData.interact.TryGetColor(ref areaColor, ref areaToColor, ref interacting, interactDuration)) { @@ -290,7 +290,7 @@ namespace XCharts.Runtime Vector3 prb, bool isYAxis, GridCoord grid, Color32 areaColor, Color32 areaToColor) { - var borderWidth = itemStyle.runtimeBorderWidth; + var borderWidth = itemStyle.borderWidth; if (isYAxis) { if (serie.clip) diff --git a/Runtime/Serie/Candlestick/CandlestickHandler.cs b/Runtime/Serie/Candlestick/CandlestickHandler.cs index a262f509..da9f9898 100644 --- a/Runtime/Serie/Candlestick/CandlestickHandler.cs +++ b/Runtime/Serie/Candlestick/CandlestickHandler.cs @@ -126,8 +126,8 @@ namespace XCharts.Runtime var heighest = serieData.GetCurrData(startDataIndex + 3, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime); var isRise = yAxis.inverse ? close open; var borderWidth = open == 0 ? 0f : - (itemStyle.runtimeBorderWidth == 0 ? theme.serie.candlestickBorderWidth : - itemStyle.runtimeBorderWidth); + (itemStyle.borderWidth == 0 ? theme.serie.candlestickBorderWidth : + itemStyle.borderWidth); if (serieData.IsDataChanged()) dataChanging = true; float pX = grid.context.x + i * categoryWidth; float zeroY = grid.context.y + yAxis.context.offset; diff --git a/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs b/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs index a49f6c19..2fbf64f5 100644 --- a/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs +++ b/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs @@ -125,8 +125,8 @@ namespace XCharts.Runtime var heighest = serieData.GetCurrData(startDataIndex + 3, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime); var isRise = yAxis.inverse ? close open; var borderWidth = open == 0 ? 0f : - (itemStyle.runtimeBorderWidth == 0 ? theme.serie.candlestickBorderWidth : - itemStyle.runtimeBorderWidth); + (itemStyle.borderWidth == 0 ? theme.serie.candlestickBorderWidth : + itemStyle.borderWidth); if (serieData.IsDataChanged()) dataChanging = true; float pX = grid.context.x + i * categoryWidth; float zeroY = grid.context.y + yAxis.context.offset;