Skip to content
Open
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions jitouch/Jitouch/Gesture.m
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ @implementation Gesture

static int quickTabSwitching;

static int middleClickFlag, magicMouseThreeFingerFlag;
static int middleClickFlag, magicMouseThreeFingerFlag, trackpadThreeFingerFlag;
static int trackpadNFingers, trackpadClicked;
static int autoScrollFlag;
static int moveResizeFlag, shouldExitMoveResize;
Expand Down Expand Up @@ -218,6 +218,7 @@ static bool familyIsMagicTrackpad(int familyID) {
}

static void turnOffTrackpad() {
trackpadThreeFingerFlag = 0;
trackpadNFingers = 0;
}

Expand Down Expand Up @@ -2126,6 +2127,8 @@ static int trackpadCallback(MTDeviceRef device, Finger *data, int nFingers, doub

if (!gestureTrackpadMoveResize(data, nFingers, timestamp)) {
if (!isTrackpadRecognizing) {
trackpadThreeFingerFlag = (nFingers == 3);

gestureTrackpadAutoScroll(data, nFingers, timestamp);

gestureTrackpadOneFixOneTap(data, nFingers, timestamp);
Expand Down Expand Up @@ -3032,7 +3035,7 @@ static CGEventRef CGEventCallback(CGEventTapProxy proxy, CGEventType type, CGEve
}

} else if (type == kCGEventScrollWheel) {
if (magicMouseThreeFingerFlag || isTrackpadRecognizing)
if (trackpadThreeFingerFlag || magicMouseThreeFingerFlag || isTrackpadRecognizing)
return NULL;
else if (autoScrollFlag) {
int64_t sc = CGEventGetIntegerValueField(event, kCGScrollWheelEventDeltaAxis1);
Expand Down