From 7ccd378e7d0775aeb3f57af41b8f06bba4b0cd90 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Wed, 8 Jan 2020 19:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=AE=BE=E7=BD=AE`A?=
 =?UTF-8?q?xisLine`=E7=9A=84`onZero`=E6=97=B6=E5=88=BB=E5=BA=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                        |  1 +
 Runtime/Internal/CoordinateChart.cs | 36 ++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1870a41..18c98036 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # 更新日志
 
+* (2020.01.08) 修复当设置`AxisLine`的`onZero`时刻度显示异常的问题
 * (2020.01.08) 增加`Mask`遮罩遮挡支持
 * (2019.12.21) 增加`Tooltip`的单个数据项和标题的字符串模版格式器
 * (2019.12.21) 增加`DataZoom`的最小显示数据个数`minShowNum`
diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs
index 6462128b..a6dac1ac 100644
--- a/Runtime/Internal/CoordinateChart.cs
+++ b/Runtime/Internal/CoordinateChart.cs
@@ -909,9 +909,17 @@ namespace XCharts
                             new Vector2(coordinateX, pY + scaleWidth),
                             yAxis.splitArea.getColor(i));
                     }
+                    if (yAxis.showSplitLine)
+                    {
+                        if (!xAxis.axisLine.show || !xAxis.axisLine.onZero || zeroPos.y != pY)
+                        {
+                            DrawSplitLine(vh, yAxis, yAxis.splitLineType, new Vector3(coordinateX, pY),
+                                new Vector3(coordinateX + coordinateWidth, pY), m_ThemeInfo.axisSplitLineColor);
+                        }
+                    }
                     if (yAxis.axisTick.show)
                     {
-                        var startX = coordinateX + m_XAxises[yAxisIndex].runtimeZeroXOffset;
+                        var startX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].runtimeZeroXOffset : 0);
                         if (yAxis.IsValue() && yAxisIndex > 0) startX += coordinateWidth;
                         bool inside = yAxis.axisTick.inside;
                         if ((inside && yAxisIndex == 0) || (!inside && yAxisIndex == 1))
@@ -925,14 +933,6 @@ namespace XCharts
                         ChartDrawer.DrawLine(vh, new Vector3(startX, pY), new Vector3(pX, pY),
                             yAxis.axisLine.width, m_ThemeInfo.axisLineColor);
                     }
-                    if (yAxis.showSplitLine)
-                    {
-                        if (!xAxis.axisLine.show || zeroPos.y != pY)
-                        {
-                            DrawSplitLine(vh, yAxis, yAxis.splitLineType, new Vector3(coordinateX, pY),
-                                new Vector3(coordinateX + coordinateWidth, pY), m_ThemeInfo.axisSplitLineColor);
-                        }
-                    }
                     totalWidth += scaleWidth;
                 }
             }
@@ -963,9 +963,17 @@ namespace XCharts
                             new Vector2(pX + scaleWidth, coordinateY),
                             xAxis.splitArea.getColor(i));
                     }
+                    if (xAxis.showSplitLine)
+                    {
+                        if (!yAxis.axisLine.show || !yAxis.axisLine.onZero || zeroPos.x != pX)
+                        {
+                            DrawSplitLine(vh, xAxis, xAxis.splitLineType, new Vector3(pX, coordinateY),
+                                new Vector3(pX, coordinateY + coordinateHeight), m_ThemeInfo.axisSplitLineColor);
+                        }
+                    }
                     if (xAxis.axisTick.show)
                     {
-                        var startY = coordinateY + m_YAxises[xAxisIndex].runtimeZeroYOffset;
+                        var startY = coordinateY + (xAxis.axisLine.onZero ? m_YAxises[xAxisIndex].runtimeZeroYOffset : 0);
                         if (xAxis.IsValue() && xAxisIndex > 0) startY += coordinateHeight;
                         bool inside = xAxis.axisTick.inside;
                         if ((inside && xAxisIndex == 0) || (!inside && xAxisIndex == 1))
@@ -979,14 +987,6 @@ namespace XCharts
                         ChartDrawer.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY),
                             xAxis.axisLine.width, m_ThemeInfo.axisLineColor);
                     }
-                    if (xAxis.showSplitLine)
-                    {
-                        if (!yAxis.axisLine.show || zeroPos.x != pX)
-                        {
-                            DrawSplitLine(vh, xAxis, xAxis.splitLineType, new Vector3(pX, coordinateY),
-                                new Vector3(pX, coordinateY + coordinateHeight), m_ThemeInfo.axisSplitLineColor);
-                        }
-                    }
                     totalWidth += scaleWidth;
                 }
             }