Skip to content
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

Jump to bottom

FlutterMouse.* -> kFlutterMouse.*, so we can lint header files. #46056

Merged
merged 7 commits into from
Sep 19, 2023
Merged

FlutterMouse.* -> kFlutterMouse.*, so we can lint header files. #46056

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9429cff
`FlutterMouse.*` -> `kFlutterMouse.*`, so we can lint header files.
matanlurey Sep 19, 2023
9710079
Update shell/platform/darwin/macos/framework/Headers/FlutterViewContr…
matanlurey Sep 19, 2023
5ff8e98
Update shell/platform/darwin/macos/framework/Headers/FlutterViewContr…
matanlurey Sep 19, 2023
92d1737
Update shell/platform/darwin/macos/framework/Headers/FlutterViewContr…
matanlurey Sep 19, 2023
0343768
Update shell/platform/darwin/macos/framework/Headers/FlutterViewContr…
matanlurey Sep 19, 2023
3aee8a7
Merge branch 'main' into engine-kFlutterMouse
matanlurey Sep 19, 2023
3cf8d39
Reformat.
matanlurey Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions shell/platform/darwin/macos/framework/Headers/FlutterViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
*/
typedef NS_ENUM(NSInteger, FlutterMouseTrackingMode) {
// Hover events will never be sent to Flutter.
FlutterMouseTrackingModeNone = 0,
kFlutterMouseTrackingModeNone = 0,
matanlurey marked this conversation as resolved.
Show resolved Hide resolved
// Hover events will be sent to Flutter when the view is in the key window.
FlutterMouseTrackingModeInKeyWindow,
kFlutterMouseTrackingModeInKeyWindow,
matanlurey marked this conversation as resolved.
Show resolved Hide resolved
// Hover events will be sent to Flutter when the view is in the active app.
FlutterMouseTrackingModeInActiveApp,
kFlutterMouseTrackingModeInActiveApp,
matanlurey marked this conversation as resolved.
Show resolved Hide resolved
// Hover events will be sent to Flutter regardless of window and app focus.
FlutterMouseTrackingModeAlways,
kFlutterMouseTrackingModeAlways,
matanlurey marked this conversation as resolved.
Show resolved Hide resolved
};

/**
Expand Down
10 changes: 5 additions & 5 deletions shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ static void CommonInit(FlutterViewController* controller, FlutterEngine* engine)
@"In unit tests, this is likely because either the FlutterViewController or "
@"the FlutterEngine is mocked. Please subclass these classes instead.",
controller.engine, controller.viewId);
controller->_mouseTrackingMode = FlutterMouseTrackingModeInKeyWindow;
controller->_mouseTrackingMode = kFlutterMouseTrackingModeInKeyWindow;
controller->_textInputPlugin = [[FlutterTextInputPlugin alloc] initWithViewController:controller];
[controller initializeKeyboard];
[controller notifySemanticsEnabledChanged];
Expand Down Expand Up @@ -642,17 +642,17 @@ - (void)configureTrackingArea {
// the view is actually loaded.
return;
}
if (_mouseTrackingMode != FlutterMouseTrackingModeNone && self.flutterView) {
if (_mouseTrackingMode != kFlutterMouseTrackingModeNone && self.flutterView) {
NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
NSTrackingInVisibleRect | NSTrackingEnabledDuringMouseDrag;
switch (_mouseTrackingMode) {
case FlutterMouseTrackingModeInKeyWindow:
case kFlutterMouseTrackingModeInKeyWindow:
options |= NSTrackingActiveInKeyWindow;
break;
case FlutterMouseTrackingModeInActiveApp:
case kFlutterMouseTrackingModeInActiveApp:
options |= NSTrackingActiveInActiveApp;
break;
case FlutterMouseTrackingModeAlways:
case kFlutterMouseTrackingModeAlways:
options |= NSTrackingActiveAlways;
break;
default:
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ id MockGestureEvent(NSEventType type, NSEventPhase phase, double magnification,
initWithAssetsPath:fixtures
ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
viewController.mouseTrackingMode = FlutterMouseTrackingModeInActiveApp;
ASSERT_EQ(viewController.mouseTrackingMode, FlutterMouseTrackingModeInActiveApp);
viewController.mouseTrackingMode = kFlutterMouseTrackingModeInActiveApp;
ASSERT_EQ(viewController.mouseTrackingMode, kFlutterMouseTrackingModeInActiveApp);
}

TEST(FlutterViewControllerTest, TestKeyEventsAreSentToFramework) {
Expand Down