Skip to content

Commit

Permalink
Merge pull request ChartsOrg#2413 from maciejtrybilo/dragXYEnabled
Browse files Browse the repository at this point in the history
Allow turning off drag in X and Y axes separately.
  • Loading branch information
liuxuan30 committed Sep 7, 2017
2 parents dca29a8 + 3a183ca commit 02818bc
Showing 1 changed file with 32 additions and 1 deletion.
33 changes: 32 additions & 1 deletion Source/Charts/Charts/BarLineChartViewBase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
fileprivate var _pinchZoomEnabled = false
fileprivate var _doubleTapToZoomEnabled = true
fileprivate var _dragEnabled = true
fileprivate var _dragYEnabled = true
fileprivate var _dragXEnabled = true

fileprivate var _scaleXEnabled = true
fileprivate var _scaleYEnabled = true
Expand Down Expand Up @@ -853,8 +855,11 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
{
if gestureRecognizer == _panGestureRecognizer
{
let velocity = _panGestureRecognizer.velocity(in: self)
if _data === nil || !_dragEnabled ||
(self.hasNoDragOffset && self.isFullyZoomedOut && !self.isHighlightPerDragEnabled)
(self.hasNoDragOffset && self.isFullyZoomedOut && !self.isHighlightPerDragEnabled) ||
(!_dragYEnabled && fabs(velocity.y) > fabs(velocity.x)) ||
(!_dragXEnabled && fabs(velocity.y) < fabs(velocity.x))
{
return false
}
Expand Down Expand Up @@ -1517,10 +1522,36 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
if _dragEnabled != newValue
{
_dragEnabled = newValue
_dragYEnabled = newValue
_dragXEnabled = newValue
}
}
}

open var dragYEnabled: Bool
{
get
{
return _dragYEnabled
}
set
{
_dragYEnabled = newValue
}
}

open var dragXEnabled: Bool
{
get
{
return _dragXEnabled
}
set
{
_dragXEnabled = newValue
}
}

/// is dragging enabled? (moving the chart with the finger) for the chart (this does not affect scaling).
open var isDragEnabled: Bool
{
Expand Down

0 comments on commit 02818bc

Please sign in to comment.