Fixed the avoidFirstLastClipping feature (Fixes #479)

ChartsOrg · Oct 23, 2015 · 0ad97f3 · 0ad97f3
1 parent 4ae557c
commit 0ad97f3
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Charts/Classes/Renderers/ChartXAxisRendererBarChart.swift b/Charts/Classes/Renderers/ChartXAxisRendererBarChart.swift
@@ -83,16 +83,19 @@ public class ChartXAxisRendererBarChart: ChartXAxisRenderer
                     {
                         let width = label!.sizeWithAttributes(labelAttrs).width
 
-                        if (width > viewPortHandler.offsetRight * 2.0
-                            && position.x + width > viewPortHandler.chartWidth)
+                        if (position.x + width / 2.0 > viewPortHandler.contentRight)
                         {
-                            position.x -= width / 2.0
+                            position.x = viewPortHandler.contentRight - (width / 2.0)
                         }
                     }
                     else if (i == 0)
                     { // avoid clipping of the first
                         let width = label!.sizeWithAttributes(labelAttrs).width
-                        position.x += width / 2.0
+
+                        if (position.x - width / 2.0 < viewPortHandler.contentLeft)
+                        {
+                            position.x = viewPortHandler.contentLeft + (width / 2.0)
+                        }
                     }
                 }