From 37c8a77de43d56cf44a61192ad52349a7514c5d0 Mon Sep 17 00:00:00 2001 From: Maciej Trybilo Date: Thu, 2 Nov 2017 17:36:36 +0000 Subject: [PATCH] Fix turning off drag in X and Y axes separately. --- Source/Charts/Charts/BarLineChartViewBase.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift index ff46f88d4e..94cbb9f6b1 100644 --- a/Source/Charts/Charts/BarLineChartViewBase.swift +++ b/Source/Charts/Charts/BarLineChartViewBase.swift @@ -871,9 +871,11 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD { if gestureRecognizer == _panGestureRecognizer { - if _data === nil || - !isDragEnabled || - (self.hasNoDragOffset && self.isFullyZoomedOut && !self.isHighlightPerDragEnabled) + let velocity = _panGestureRecognizer.velocity(in: self) + if _data === nil || !isDragEnabled || + (self.hasNoDragOffset && self.isFullyZoomedOut && !self.isHighlightPerDragEnabled) || + (!_dragYEnabled && fabs(velocity.y) > fabs(velocity.x)) || + (!_dragXEnabled && fabs(velocity.y) < fabs(velocity.x)) { return false }