Taking the y scale into account to allow / block further zooming.

ChartsOrg · Oct 12, 2015 · e1b4982 · e1b4982
1 parent 4009962
commit e1b4982
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -725,8 +725,9 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
         {
             let isZoomingOut = (recognizer.scale < 1)
             let canZoomMoreX = isZoomingOut ? _viewPortHandler.canZoomOutMoreX : _viewPortHandler.canZoomInMoreX
+            let canZoomMoreY = isZoomingOut ? _viewPortHandler.canZoomOutMoreY : _viewPortHandler.canZoomInMoreY
 
-            if (_isScaling && canZoomMoreX)
+            if (_isScaling && canZoomMoreX && canZoomMoreY)
             {
                 if (_gestureScaleAxis == .Both || _gestureScaleAxis == .Y && _scaleYEnabled)
                 {

diff --git a/Charts/Classes/Utils/ChartViewPortHandler.swift b/Charts/Classes/Utils/ChartViewPortHandler.swift
@@ -457,4 +457,14 @@ public class ChartViewPortHandler: NSObject
     {
         return (_scaleX < _maxScaleX)
     }
+
+    public var canZoomOutMoreY: Bool
+    {
+        return (_scaleY > _minScaleY)
+    }
+
+    public var canZoomInMoreY: Bool
+    {
+        return (_scaleY < _maxScaleY)
+    }
 }