Skip to content

I fixed your godawful touch controls #7697

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

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

I fixed your godawful touch controls #7697

Show file tree
Hide file tree
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
33 changes: 30 additions & 3 deletions Platform/iOS/Display/VMDisplayMetalViewController+Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,45 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable) VMScroll *scroll;

// Gestures
@property (nonatomic, nullable) UISwipeGestureRecognizer *swipeUp;
@property (nonatomic, nullable) UISwipeGestureRecognizer *swipeDown;
@property (nonatomic, nullable) UISwipeGestureRecognizer *swipeScrollUp;
@property (nonatomic, nullable) UISwipeGestureRecognizer *swipeScrollDown;
@property (nonatomic, nullable) UIPanGestureRecognizer *pan;
@property (nonatomic, nullable) UIPanGestureRecognizer *twoPan;
@property (nonatomic, nullable) UIPanGestureRecognizer *threePan;
@property (nonatomic, nullable) UIPinchGestureRecognizer *pinch;
@property (nonatomic, nullable) UITapGestureRecognizer *tap;
@property (nonatomic, nullable) UITapGestureRecognizer *tapPencil;
@property (nonatomic, nullable) UITapGestureRecognizer *twoTap;
@property (nonatomic, nullable) UITapGestureRecognizer *threeTap;
@property (nonatomic, nullable) UILongPressGestureRecognizer *longPress;
@property (nonatomic, nullable) UIPinchGestureRecognizer *pinch;
@property (nonatomic, nullable) UITouch *multitouchPrimaryTouch;
@property (nonatomic) BOOL multitouchTwoPanConsumed;
@property (nonatomic) BOOL multitouchThreePanConsumed;
@property (nonatomic) BOOL multitouchTwoPanActionStarted;
@property (nonatomic) BOOL multitouchThreePanActionStarted;
@property (nonatomic) BOOL multitouchTwoSwipeDecided;
@property (nonatomic) BOOL multitouchThreeSwipeDecided;
@property (nonatomic) BOOL multitouchTwoSwipeCandidate;
@property (nonatomic) BOOL multitouchThreeSwipeCandidate;
@property (nonatomic) CGPoint multitouchTwoPanLastVelocity;
@property (nonatomic) CGPoint multitouchThreePanLastVelocity;
@property (nonatomic) NSTimeInterval multitouchTwoPanLastTime;
@property (nonatomic) NSTimeInterval multitouchThreePanLastTime;
@property (nonatomic) NSTimeInterval multitouchTwoPanBeginTime;
@property (nonatomic) NSTimeInterval multitouchThreePanBeginTime;
@property (nonatomic) BOOL multitouchPinchActive;
@property (nonatomic) CGFloat multitouchPinchInitialDistance;
@property (nonatomic) NSUInteger multitouchActiveDirectTouchCount;
@property (nonatomic) BOOL multitouchLongPressRecognized;
@property (nonatomic) BOOL multitouchLongPressPending;
@property (nonatomic) BOOL multitouchLongPressDragging;
@property (nonatomic) BOOL multitouchLongPressTouchActive;
@property (nonatomic) BOOL multitouchLongPressCancelledByMovement;
@property (nonatomic) CGPoint multitouchLongPressOrigin;
@property (nonatomic) CGPoint multitouchPrimaryTouchLocation;
@property (nonatomic) CGPoint multitouchScrollLastLocation;
@property (nonatomic) CGPoint multitouchScrollVelocity;
@property (nonatomic) NSTimeInterval multitouchScrollLastTime;

//Gamepad
@property (nonatomic, nullable) GCController *controller;
Expand Down
5 changes: 5 additions & 0 deletions Platform/iOS/Display/VMDisplayMetalViewController+Touch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ typedef NS_ENUM(NSInteger, VMGestureType) {
VMGestureTypeRightClick,
VMGestureTypeMoveScreen,
VMGestureTypeMouseWheel,
VMGestureTypeMiddleClick,
VMGestureTypeRightDrag,
VMGestureTypeMiddleDrag,
VMGestureTypeScaleDisplay,
VMGestureTypeMax
};

typedef NS_ENUM(NSInteger, VMMouseType) {
VMMouseTypeRelative,
VMMouseTypeAbsolute,
VMMouseTypeAbsoluteHideCursor,
VMMouseTypeMultitouch,
VMMouseTypeMax
};

Expand Down
Loading