Fixed the new minOffset in some cases (Fixes #395)

ChartsOrg · Oct 1, 2015 · d5e58da · d5e58da
1 parent 225ce3d
commit d5e58da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Charts/Classes/Charts/HorizontalBarChartView.swift b/Charts/Classes/Charts/HorizontalBarChartView.swift
@@ -97,13 +97,11 @@ public class HorizontalBarChartView: BarChartView
         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()
         prepareValuePxMatrix()

diff --git a/Charts/Classes/Charts/PieRadarChartViewBase.swift b/Charts/Classes/Charts/PieRadarChartViewBase.swift
@@ -196,20 +196,22 @@ public class PieRadarChartViewBase: ChartViewBase
         legendBottom += self.extraBottomOffset
         legendLeft += self.extraLeftOffset
 
+        var minOffset = self.minOffset
+
         if (self.isKindOfClass(RadarChartView))
         {
             let x = (self as! RadarChartView).xAxis
 
             if x.isEnabled && x.drawLabelsEnabled
             {
-                minOffset = max(10.0, x.labelWidth)
+                minOffset = max(minOffset, x.labelWidth)
             }
         }
 
-        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))
+        let offsetLeft = max(minOffset, legendLeft)
+        let offsetTop = max(minOffset, legendTop)
+        let offsetRight = max(minOffset, legendRight)
+        let offsetBottom = max(minOffset, max(self.requiredBaseOffset, legendBottom))
 
         _viewPortHandler.restrainViewPort(offsetLeft: offsetLeft, offsetTop: offsetTop, offsetRight: offsetRight, offsetBottom: offsetBottom)
     }