Merge pull request #464 from coupgar/feature/tableview_hack

Approved, pending styling: Fix Scroll issue when the graph is in a UITableView
ChartsOrg · Oct 30, 2015 · 530cbab · 530cbab
2 parents 19b0726 + f026302
commit 530cbab
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -987,6 +987,14 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
             {
                 scrollView = scrollView?.superview
             }
+
+            // If there is two scrollview together, we pick the superview of the inner scrollview.
+            // In the case of UITableViewWrepperView, the superview will be UITableView
+            if let superViewOfScrollView = scrollView?.superview where superViewOfScrollView.isKindOfClass(UIScrollView)
+            {
+                scrollView = superViewOfScrollView
+            }
+
             var foundScrollView = scrollView as? UIScrollView
 
             if (foundScrollView !== nil && !foundScrollView!.scrollEnabled)