Skip to content

Commit 7e225f0

Browse files
committed
Revert "Send macOS keyboard data to the engine (flutter#8219)"
This reverts commit 551a726.
1 parent fe002e8 commit 7e225f0

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

shell/platform/darwin/macos/framework/Source/FLEViewController.mm

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616

1717
static const int kDefaultWindowFramebuffer = 0;
1818

19+
// Android KeyEvent constants from https://developer.android.com/reference/android/view/KeyEvent
20+
static const int kAndroidMetaStateShift = 1 << 0;
21+
static const int kAndroidMetaStateAlt = 1 << 1;
22+
static const int kAndroidMetaStateCtrl = 1 << 12;
23+
static const int kAndroidMetaStateMeta = 1 << 16;
24+
1925
#pragma mark - Private interface declaration.
2026

2127
/**
@@ -470,12 +476,14 @@ - (void)dispatchMouseEvent:(NSEvent*)event phase:(FlutterPointerPhase)phase {
470476

471477
- (void)dispatchKeyEvent:(NSEvent*)event ofType:(NSString*)type {
472478
[_keyEventChannel sendMessage:@{
473-
@"keymap" : @"macos",
479+
@"keymap" : @"android",
474480
@"type" : type,
475481
@"keyCode" : @(event.keyCode),
476-
@"modifiers" : @(event.modifierFlags),
477-
@"characters" : event.characters,
478-
@"charactersIgnoringModifiers" : event.charactersIgnoringModifiers,
482+
@"metaState" :
483+
@(((event.modifierFlags & NSEventModifierFlagShift) ? kAndroidMetaStateShift : 0) |
484+
((event.modifierFlags & NSEventModifierFlagOption) ? kAndroidMetaStateAlt : 0) |
485+
((event.modifierFlags & NSEventModifierFlagControl) ? kAndroidMetaStateCtrl : 0) |
486+
((event.modifierFlags & NSEventModifierFlagCommand) ? kAndroidMetaStateMeta : 0))
479487
}];
480488
}
481489

0 commit comments

Comments
 (0)