wnagrodzki/DragGestureRecognizer
1
0
Fork 0
mirror of https://github.com/wnagrodzki/DragGestureRecognizer.git synced 2025-04-05 12:01:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a bug that caused translation to be calculated incorrectly when device was not in portrait orientation

Browse source
This commit is contained in:
Wojciech Nagrodzki 2019-03-14 19:30:35 +01:00
parent a7629a83b5
commit f4852c8f07
Signed by: wnagrodzki
GPG key ID: E9D0EB0302264569
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
DragGestureRecognizer/DragGestureRecognizer.swift
View file

@ -12,6 +12,9 @@ import UIKit.UIGestureRecognizerSubclass
/// `DragGestureRecognizer` is a subclass of `UILongPressGestureRecognizer` that allows for tracking translation similarly to `UIPanGestureRecognizer`. /// `DragGestureRecognizer` is a subclass of `UILongPressGestureRecognizer` that allows for tracking translation similarly to `UIPanGestureRecognizer`.
class DragGestureRecognizer: UILongPressGestureRecognizer { class DragGestureRecognizer: UILongPressGestureRecognizer {
private var initialTouchLocationInScreenFixedCoordinateSpace: CGPoint?
private var initialTouchLocationsInViews = [UIView: CGPoint]()
/// The total translation of the drag gesture in the coordinate system of the specified view. /// The total translation of the drag gesture in the coordinate system of the specified view.
/// - parameters: /// - parameters:
/// - view: The view in whose coordinate system the translation of the drag gesture should be computed. Pass `nil` to indicate window. /// - view: The view in whose coordinate system the translation of the drag gesture should be computed. Pass `nil` to indicate window.
@ -20,11 +23,19 @@ class DragGestureRecognizer: UILongPressGestureRecognizer {
// not attached to a view or outside window // not attached to a view or outside window
guard let window = self.view?.window else { return CGPoint() } guard let window = self.view?.window else { return CGPoint() }
// gesture not in progress // gesture not in progress
guard let initialTouchLocationInWindow = initialTouchLocationInWindow else { return CGPoint() } guard let initialTouchLocationInScreenFixedCoordinateSpace = initialTouchLocationInScreenFixedCoordinateSpace else { return CGPoint() }
let inView = view ?? window let initialLocation: CGPoint
let initialLocation = initialTouchLocationsInViews[inView] ?? window.convert(initialTouchLocationInWindow, to: inView) let currentLocation: CGPoint
let currentLocation = location(in: inView)
if let view = view {
initialLocation = initialTouchLocationsInViews[view] ?? window.screen.fixedCoordinateSpace.convert(initialTouchLocationInScreenFixedCoordinateSpace, to: view)
currentLocation = location(in: view)
}
else {
initialLocation = initialTouchLocationInScreenFixedCoordinateSpace
currentLocation = location(in: nil)
}
return CGPoint(x: currentLocation.x - initialLocation.x, y: currentLocation.y - initialLocation.y) return CGPoint(x: currentLocation.x - initialLocation.x, y: currentLocation.y - initialLocation.y)
} }
@ -38,7 +49,7 @@ class DragGestureRecognizer: UILongPressGestureRecognizer {
// not attached to a view or outside window // not attached to a view or outside window
guard let window = self.view?.window else { return } guard let window = self.view?.window else { return }
// gesture not in progress // gesture not in progress
guard let _ = initialTouchLocationInWindow else { return } guard let _ = initialTouchLocationInScreenFixedCoordinateSpace else { return }
let inView = view ?? window let inView = view ?? window
let currentLocation = location(in: inView) let currentLocation = location(in: inView)
@ -53,10 +64,10 @@ class DragGestureRecognizer: UILongPressGestureRecognizer {
switch state { switch state {
case .began: case .began:
initialTouchLocationInWindow = location(in: nil) initialTouchLocationInScreenFixedCoordinateSpace = location(in: nil)
case .ended, .cancelled, .failed: case .ended, .cancelled, .failed:
initialTouchLocationInWindow = nil initialTouchLocationInScreenFixedCoordinateSpace = nil
initialTouchLocationsInViews = [:] initialTouchLocationsInViews = [:]
case .possible, .changed: case .possible, .changed:
@ -64,7 +75,4 @@ class DragGestureRecognizer: UILongPressGestureRecognizer {
} }
} }
} }
private var initialTouchLocationInWindow: CGPoint?
private var initialTouchLocationsInViews = [UIView: CGPoint]()
} }