Allow the minimum offset for BarLine and PieRadar charts to be custom…

…ized
ChartsOrg · Sep 22, 2015 · 26b03da · 26b03da
1 parent 7b85077
commit 26b03da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -44,6 +44,9 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
 
     /// Sets drawing the borders rectangle to true. If this is enabled, there is no point drawing the axis-lines of x- and y-axis.
     public var drawBordersEnabled = false
+
+    /// Sets the minimum offset (padding) around the chart, defaults to 10
+    public var minOffset = CGFloat(10.0)
 
     /// the object representing the labels on the y-axis, this object is prepared
     /// in the pepareYLabels() method
@@ -446,14 +449,12 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
             offsetRight += self.extraRightOffset
             offsetBottom += self.extraBottomOffset
             offsetLeft += self.extraLeftOffset
-
-            let minOffset = CGFloat(10.0)
-
+
             _viewPortHandler.restrainViewPort(
-                offsetLeft: max(minOffset, offsetLeft),
-                offsetTop: max(minOffset, offsetTop),
-                offsetRight: max(minOffset, offsetRight),
-                offsetBottom: max(minOffset, offsetBottom))
+                offsetLeft: max(self.minOffset, offsetLeft),
+                offsetTop: max(self.minOffset, offsetTop),
+                offsetRight: max(self.minOffset, offsetRight),
+                offsetBottom: max(self.minOffset, offsetBottom))
         }
 
         prepareOffsetMatrix()

diff --git a/Charts/Classes/Charts/PieRadarChartViewBase.swift b/Charts/Classes/Charts/PieRadarChartViewBase.swift
@@ -27,6 +27,9 @@ public class PieRadarChartViewBase: ChartViewBase
     /// flag that indicates if rotation is enabled or not
     public var rotationEnabled = true
 
+    /// Sets the minimum offset (padding) around the chart, defaults to 10
+    public var minOffset = CGFloat(10.0)
+
     private var _rotationWithTwoFingers = false
 
     private var _tapGestureRecognizer: UITapGestureRecognizer!
@@ -188,8 +191,6 @@ public class PieRadarChartViewBase: ChartViewBase
         legendRight += self.extraRightOffset
         legendBottom += self.extraBottomOffset
         legendLeft += self.extraLeftOffset
-
-        var minOffset = CGFloat(10.0)
 
         if (self.isKindOfClass(RadarChartView))
         {
@@ -201,10 +202,10 @@ public class PieRadarChartViewBase: ChartViewBase
             }
         }
 
-        let offsetLeft = max(minOffset, legendLeft)
-        let offsetTop = max(minOffset, legendTop)
-        let offsetRight = max(minOffset, legendRight)
-        let offsetBottom = max(minOffset, max(self.requiredBaseOffset, legendBottom))
+        let offsetLeft = max(self.minOffset, legendLeft)
+        let offsetTop = max(self.minOffset, legendTop)
+        let offsetRight = max(self.minOffset, legendRight)
+        let offsetBottom = max(self.minOffset, max(self.requiredBaseOffset, legendBottom))
 
         _viewPortHandler.restrainViewPort(offsetLeft: offsetLeft, offsetTop: offsetTop, offsetRight: offsetRight, offsetBottom: offsetBottom)
     }