Merge pull request #1452 from DashRobotics/Swift-2.3

Fix bar layout bug, pie callback bug
ChartsOrg · Sep 19, 2016 · efbbae4 · efbbae4
2 parents ee51dba + 6e36b70
commit efbbae4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Charts/Classes/Charts/BarChartView.swift b/Charts/Classes/Charts/BarChartView.swift
@@ -39,7 +39,7 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider
         {
             _xAxis.calculate(
                 min: data.xMin - data.barWidth / 2.0,
-                max: data.xMax - data.barWidth / 2.0)
+                max: data.xMax + data.barWidth / 2.0)
         }
         else
         {
@@ -165,4 +165,4 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider
 
     /// - returns: `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
     public var isDrawBarShadowEnabled: Bool { return drawBarShadowEnabled }
-}
+}
diff --git a/Charts/Classes/Charts/PieRadarChartViewBase.swift b/Charts/Classes/Charts/PieRadarChartViewBase.swift
@@ -829,7 +829,7 @@ public class PieRadarChartViewBase: ChartViewBase
             let location = recognizer.locationInView(self)
 
             let high = self.getHighlightByTouchPoint(location)
-            self.highlightValue(high)
+            self.highlightValue(highlight: high, callDelegate: true)
         }
     }
 
@@ -873,4 +873,4 @@ public class PieRadarChartViewBase: ChartViewBase
         }
     }
     #endif
-}
+}