Revert ChartsOrg#4271 and disable parent scroll view on dragging

atm-com · Jul 9, 2020 · 22e8eca · 22e8eca
1 parent 7ac4a05
commit 22e8eca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift
@@ -739,6 +739,10 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                 // We will only handle highlights on NSUIGestureRecognizerState.Changed
 
                 _isDragging = false
+
+                // Prevent the parent scroll view from scrolling
+                _outerScrollView?.nsuiIsScrollEnabled = false
+
             }
         }
         else if recognizer.state == NSUIGestureRecognizerState.changed
@@ -790,15 +794,15 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                 }
 
                 _isDragging = false
-
-                delegate?.chartViewDidEndPanning?(self)
             }
 
             if _outerScrollView !== nil
             {
                 _outerScrollView?.nsuiIsScrollEnabled = true
                 _outerScrollView = nil
             }
+
+            delegate?.chartViewDidEndPanning?(self)
         }
     }