From 247942b766df62a7ebad3bb2159d4491cf8d0900 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 18 May 2021 13:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Editor=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=9B=E5=BB=BA=20#147?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/XChartEditor.cs | 3 +++ Runtime/Internal/CoordinateChart.cs | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Editor/XChartEditor.cs b/Editor/XChartEditor.cs index 66fcec7b..3cf0336f 100644 --- a/Editor/XChartEditor.cs +++ b/Editor/XChartEditor.cs @@ -70,6 +70,9 @@ namespace XCharts rect.anchorMin = new Vector2(0.5f, 0.5f); rect.anchorMax = new Vector2(0.5f, 0.5f); rect.pivot = new Vector2(0.5f, 0.5f); + GameObjectUtility.EnsureUniqueNameForSibling(chart); + Selection.activeGameObject = chart; + EditorUtility.SetDirty(chart); } [MenuItem("XCharts/LineChart", priority = 44)] diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs index b9099bf1..5858e6c1 100644 --- a/Runtime/Internal/CoordinateChart.cs +++ b/Runtime/Internal/CoordinateChart.cs @@ -1046,15 +1046,15 @@ namespace XCharts var grid = GetAxisGridOrDefault(yAxis); var size = AxisHelper.GetScaleNumber(yAxis, grid.runtimeWidth, dataZoom); var totalWidth = grid.runtimeY; - for (int i = 0; i < size; i++) + for (int i = 0; i <= size; i++) { var scaleWidth = AxisHelper.GetScaleWidth(yAxis, grid.runtimeHeight, i + 1, dataZoom); - if (i == 0 && !yAxis.axisTick.showStartTick) + if (i == 0 && (!yAxis.axisTick.showStartTick || yAxis.axisTick.alignWithLabel)) { totalWidth += scaleWidth; continue; } - if (i == size - 1 && !yAxis.axisTick.showEndTick) + if (i == size && !yAxis.axisTick.showEndTick) { totalWidth += scaleWidth; continue; @@ -1166,8 +1166,7 @@ namespace XCharts for (int i = 0; i <= size; i++) { var scaleWidth = AxisHelper.GetScaleWidth(xAxis, grid.runtimeWidth, i + 1, dataZoom); - - if (i == 0 && !xAxis.axisTick.showStartTick) + if (i == 0 && (!xAxis.axisTick.showStartTick || xAxis.axisTick.alignWithLabel)) { totalWidth += scaleWidth; continue;