Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Master into 5.0.0 #7

Merged
merged 8 commits into from
Dec 12, 2023
Merged

Merge Master into 5.0.0 #7

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
726629e
Add dragging, scaling and decelerating variables to BarLineChartViewBase
Feb 8, 2018
4649eb9
Merge pull request #1 from fishbrain/dragging-scaling-decelerating-in…
kzyryanov Feb 8, 2018
bc2a7da
Merge remote-tracking branch 'upstream/master'
Sep 28, 2018
4b44d32
Merge pull request #2 from danielgindi/master
joeboyscout04 Apr 20, 2020
33349fe
Merge tag 'v3.6.0' of https://github.com/danielgindi/Charts into 3.6.0
joeboyscout04 Feb 11, 2021
cede3d4
Merge pull request #3 from fishbrain/3.6.0
joeboyscout04 Feb 11, 2021
6428b8b
Merge branch 'danielgindi:master' into master
mustiikhalil Jul 7, 2022
aab1a24
Merge branch 'danielgindi:master' into master
mustiikhalil Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Source/Charts/Charts/BarLineChartViewBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
private var _scaleXEnabled = true
private var _scaleYEnabled = true

@objc open var isDragging: Bool {
return _isDragging
}

@objc open var isDecelerating: Bool {
return _decelerationDisplayLink != nil
}

@objc open var isScaling: Bool {
return _isScaling
}

/// the color for the background of the chart-drawing area (everything behind the grid lines).
@objc open var gridBackgroundColor = NSUIColor(red: 240/255.0, green: 240/255.0, blue: 240/255.0, alpha: 1.0)

Expand Down