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

Allow trackpad swipe to scroll in Catalyst apps #5119

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow trackpad swipe to scroll in Catalyst apps #5119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion Source/Charts/Charts/BarLineChartViewBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD

_panGestureRecognizer.delegate = self

// Allow trackpad swipe to scroll in Catalyst apps
#if targetEnvironment(macCatalyst)
if #available(iOS 13.4, macCatalyst 13.4, *) {
_panGestureRecognizer.allowedScrollTypesMask = .all
}
_panGestureRecognizer.maximumNumberOfTouches = 0
#endif

self.addGestureRecognizer(_tapGestureRecognizer)
self.addGestureRecognizer(_doubleTapGestureRecognizer)
self.addGestureRecognizer(_panGestureRecognizer)
Expand Down Expand Up @@ -677,7 +685,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD

@objc private func panGestureRecognized(_ recognizer: NSUIPanGestureRecognizer)
{
if recognizer.state == NSUIGestureRecognizerState.began && recognizer.nsuiNumberOfTouches() > 0
// Allow trackpad swipe to scroll in Catalyst apps
#if targetEnvironment(macCatalyst)
let isBeginning = recognizer.state == NSUIGestureRecognizerState.began
#else
let isBeginning = recognizer.state == NSUIGestureRecognizerState.began && recognizer.nsuiNumberOfTouches() > 0
#endif
if isBeginning
{
stopDeceleration()

Expand Down