Differential D9723 Diff 31548 intern/ghost/intern/GHOST_SystemCocoa.mm

Changeset View

Standalone View

	Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
	/* However, wacom tablet (intuos5) needs old deltas,			/* However, wacom tablet (intuos5) needs old deltas,
	* it then has momentum and phase at zero. */			* it then has momentum and phase at zero. */
	if (phase == NSEventPhaseNone && momentumPhase == NSEventPhaseNone) {			if (phase == NSEventPhaseNone && momentumPhase == NSEventPhaseNone) {
	dx = [event deltaX];			dx = [event deltaX];
	dy = [event deltaY];			dy = [event deltaY];
	}			}
	window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);			window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);

				NSPoint delta = [[cocoawindow contentView] convertPointToBacking:NSMakePoint(dx, dy)];
	pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000,			pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000,
	window,			window,
	GHOST_kTrackpadEventScroll,			GHOST_kTrackpadEventScroll,
	x,			x,
	y,			y,
	dx,			delta.x,
	dy,			delta.y,
	[event isDirectionInvertedFromDevice]));			[event isDirectionInvertedFromDevice]));
	}			}
	} break;			} break;

	case NSEventTypeMagnify: {			case NSEventTypeMagnify: {
	NSPoint mousePos = [event locationInWindow];			NSPoint mousePos = [event locationInWindow];
	GHOST_TInt32 x, y;			GHOST_TInt32 x, y;
	window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);			window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
	▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines