Clip drawing area of limit lines when !isDrawLimitLinesBehindDataEnabled

(Closes #1052)
ChartsOrg · May 22, 2016 · 9a7aeb2 · 9a7aeb2
1 parent 6406e61
commit 9a7aeb2
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -216,52 +216,55 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
 
         // make sure the graph values and grid cannot be drawn outside the content-rect
         CGContextSaveGState(context)
-
         CGContextClipToRect(context, _viewPortHandler.contentRect)
 
         _xAxisRenderer?.renderGridLines(context: context)
         _leftYAxisRenderer?.renderGridLines(context: context)
         _rightYAxisRenderer?.renderGridLines(context: context)
 
-        if (_xAxis.isDrawLimitLinesBehindDataEnabled)
+        if _xAxis.isDrawLimitLinesBehindDataEnabled
         {
             _xAxisRenderer?.renderLimitLines(context: context)
         }
-        if (_leftAxis.isDrawLimitLinesBehindDataEnabled)
+        if _leftAxis.isDrawLimitLinesBehindDataEnabled
         {
             _leftYAxisRenderer?.renderLimitLines(context: context)
         }
-        if (_rightAxis.isDrawLimitLinesBehindDataEnabled)
+        if _rightAxis.isDrawLimitLinesBehindDataEnabled
         {
             _rightYAxisRenderer?.renderLimitLines(context: context)
         }
 
         renderer?.drawData(context: context)
-
+        
         // if highlighting is enabled
         if (valuesToHighlight())
         {
             renderer?.drawHighlighted(context: context, indices: _indicesToHighlight)
         }
-
-        // Removes clipping rectangle
+
         CGContextRestoreGState(context)
 
         renderer!.drawExtras(context: context)
 
-        if (!_xAxis.isDrawLimitLinesBehindDataEnabled)
+        CGContextSaveGState(context)
+        CGContextClipToRect(context, _viewPortHandler.contentRect)
+
+        if !_xAxis.isDrawLimitLinesBehindDataEnabled
         {
             _xAxisRenderer?.renderLimitLines(context: context)
         }
-        if (!_leftAxis.isDrawLimitLinesBehindDataEnabled)
+        if !_leftAxis.isDrawLimitLinesBehindDataEnabled
         {
             _leftYAxisRenderer?.renderLimitLines(context: context)
         }
-        if (!_rightAxis.isDrawLimitLinesBehindDataEnabled)
+        if !_rightAxis.isDrawLimitLinesBehindDataEnabled
         {
             _rightYAxisRenderer?.renderLimitLines(context: context)
         }
 
+        CGContextRestoreGState(context)
+
         _xAxisRenderer.renderAxisLabels(context: context)
         _leftYAxisRenderer.renderAxisLabels(context: context)
         _rightYAxisRenderer.renderAxisLabels(context: context)