DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1739 from mxia/master

Browse Source 
Fixed build errors when building for Mac desktop.
This commit is contained in:
Adam Barth 2015-10-22 13:10:32 -07:00
commit 5ee6a6e51d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sky/shell/mac/sky_window.mm
View File

@ -23,22 +23,22 @@
static inline sky::EventType EventTypeFromNSEventPhase(NSEventPhase phase) {
switch (phase) {
case NSEventPhaseNone:
return sky::EVENT_TYPE_UNKNOWN;
return sky::EventType::UNKNOWN;
case NSEventPhaseBegan:
return sky::EVENT_TYPE_POINTER_DOWN;
return sky::EventType::POINTER_DOWN;
case NSEventPhaseStationary:
// There is no EVENT_TYPE_POINTER_STATIONARY. So we just pass a move type
// with the same coordinates
case NSEventPhaseChanged:
return sky::EVENT_TYPE_POINTER_MOVE;
return sky::EventType::POINTER_MOVE;
case NSEventPhaseEnded:
return sky::EVENT_TYPE_POINTER_UP;
return sky::EventType::POINTER_UP;
case NSEventPhaseCancelled:
return sky::EVENT_TYPE_POINTER_CANCEL;
return sky::EventType::POINTER_CANCEL;
case NSEventPhaseMayBegin:
return sky::EVENT_TYPE_UNKNOWN;
return sky::EventType::UNKNOWN;
}
return sky::EVENT_TYPE_UNKNOWN;
return sky::EventType::UNKNOWN;
}
@implementation SkyWindow {
@ -160,7 +160,7 @@ static inline sky::EventType EventTypeFromNSEventPhase(NSEventPhase phase) {
base::TimeDelta::FromSecondsD(event.timestamp).InMilliseconds();
input->pointer_data = sky::PointerData::New();
input->pointer_data->kind = sky::POINTER_KIND_TOUCH;
input->pointer_data->kind = sky::PointerKind::TOUCH;
input->pointer_data->x = location.x;
input->pointer_data->y = location.y;