From 78b11a5f4ae96bec37dbe2703b15b6a9ff35bb5a Mon Sep 17 00:00:00 2001 From: Lloyd <651519531@qq.com> Date: Fri, 8 May 2020 15:06:08 +0800 Subject: [PATCH 1/2] fix unable to drag highlight when zoomed into line chart --- .../charting/listener/BarLineChartTouchListener.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java index 5685d32fa0..f477123c24 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java @@ -213,6 +213,13 @@ public boolean onTouch(View v, MotionEvent event) { } } + }else{ + if (mChart.isHighlightPerDragEnabled()) { + mLastGesture = ChartGesture.DRAG; + + if (mChart.isHighlightPerDragEnabled()) + performHighlightDrag(event); + } } } From d277bbb5a1e6572c002db15c74e0a24b1c15a823 Mon Sep 17 00:00:00 2001 From: Lloyd <651519531@qq.com> Date: Mon, 11 May 2020 16:46:35 +0800 Subject: [PATCH 2/2] fix gesture confict when drag highlight --- .../mikephil/charting/listener/BarLineChartTouchListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java index f477123c24..ffa814134c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java @@ -448,6 +448,7 @@ private void performZoom(MotionEvent event) { */ private void performHighlightDrag(MotionEvent e) { + mChart.disableScroll(); Highlight h = mChart.getHighlightByTouchPoint(e.getX(), e.getY()); if (h != null && !h.equalTo(mLastHighlighted)) {