labelXOffset = 10 is default for radar chart only

+ also consider other renderers Fixes ChartsOrg/Charts#3406
rcblue · Jan 23, 2020 · c630d7c · c630d7c
1 parent 0d9b54d
commit c630d7c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/Source/Charts/Charts/RadarChartView.swift b/Source/Charts/Charts/RadarChartView.swift
@@ -59,6 +59,7 @@ open class RadarChartView: PieRadarChartViewBase
         super.initialize()
 
         _yAxis = YAxis(position: .left)
+        _yAxis.labelXOffset = 10.0
 
         renderer = RadarChartRenderer(chart: self, animator: _animator, viewPortHandler: _viewPortHandler)
 

diff --git a/Source/Charts/Components/YAxis.swift b/Source/Charts/Components/YAxis.swift
@@ -81,7 +81,7 @@ open class YAxis: AxisBase
     @objc open var labelAlignment: NSTextAlignment = .left
 
     /// the horizontal offset of the y-label
-    @objc open var labelXOffset: CGFloat = 10.0
+    @objc open var labelXOffset: CGFloat = 0.0
 
     /// the side this axis object represents
     private var _axisDependency = AxisDependency.left

diff --git a/Source/Charts/Renderers/YAxisRenderer.swift b/Source/Charts/Renderers/YAxisRenderer.swift
@@ -142,14 +142,16 @@ open class YAxisRenderer: AxisRendererBase
         let from = yAxis.isDrawBottomYLabelEntryEnabled ? 0 : 1
         let to = yAxis.isDrawTopYLabelEntryEnabled ? yAxis.entryCount : (yAxis.entryCount - 1)
 
+        let xOffset = yAxis.labelXOffset
+
         for i in stride(from: from, to: to, by: 1)
         {
             let text = yAxis.getFormattedLabel(i)
 
             ChartUtils.drawText(
                 context: context,
                 text: text,
-                point: CGPoint(x: fixedPosition, y: positions[i].y + offset),
+                point: CGPoint(x: fixedPosition + xOffset, y: positions[i].y + offset),
                 align: textAlign,
                 attributes: [.font: labelFont, .foregroundColor: labelTextColor]
             )

diff --git a/Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift b/Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift
@@ -155,14 +155,19 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
         let from = yAxis.isDrawBottomYLabelEntryEnabled ? 0 : 1
         let to = yAxis.isDrawTopYLabelEntryEnabled ? yAxis.entryCount : (yAxis.entryCount - 1)
 
+        let xOffset = yAxis.labelXOffset
+
         for i in stride(from: from, to: to, by: 1)
         {
             let text = yAxis.getFormattedLabel(i)
 
             ChartUtils.drawText(
                 context: context,
                 text: text,
-                point: CGPoint(x: positions[i].x, y: fixedPosition - offset),
+                point: CGPoint(
+                    x: positions[i].x, y:
+                    fixedPosition - offset + xOffset
+                ),
                 align: .center,
                 attributes: [NSAttributedString.Key.font: labelFont, NSAttributedString.Key.foregroundColor: labelTextColor])
         }

diff --git a/Source/Charts/Renderers/YAxisRendererRadarChart.swift b/Source/Charts/Renderers/YAxisRendererRadarChart.swift
@@ -187,7 +187,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
         let to = yAxis.isDrawTopYLabelEntryEnabled ? yAxis.entryCount : (yAxis.entryCount - 1)
 
         let alignment: NSTextAlignment = yAxis.labelAlignment
-        let xOffset: CGFloat = yAxis.labelXOffset
+        let xOffset = yAxis.labelXOffset
 
         for j in stride(from: from, to: to, by: 1)
         {