Merge pull request #1319 from essoecc/scaleEnabled

Refined scaleXEnabled/scaleYEnabled conditioning
ChartsOrg · Aug 14, 2016 · b4282a8 · b4282a8
2 parents 72b6fb3 + 2b6ac7c
commit b4282a8
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -573,13 +573,27 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
                     let x = abs(recognizer.locationInView(self).x - recognizer.nsuiLocationOfTouch(1, inView: self).x)
                     let y = abs(recognizer.locationInView(self).y - recognizer.nsuiLocationOfTouch(1, inView: self).y)
 
-                    if (x > y)
+                    if (_scaleXEnabled != _scaleYEnabled)
                     {
-                        _gestureScaleAxis = .X
+                        if (_scaleXEnabled)
+                        {
+                            _gestureScaleAxis = .X
+                        }
+                        else
+                        {
+                            _gestureScaleAxis = .Y   
+                        }
                     }
                     else
                     {
-                        _gestureScaleAxis = .Y
+                        if (x > y)
+                        {
+                            _gestureScaleAxis = .X
+                        }
+                        else
+                        {
+                            _gestureScaleAxis = .Y
+                        }
                     }
                 }
             }