Skip to content

Commit

Permalink
FlutterMouse.* -> kFlutterMouse.*, so we can lint header files. (#…
Browse files Browse the repository at this point in the history
…46056)

Partial work towards flutter/flutter#134969.

---------

Co-authored-by: Chris Bracken <chris@bracken.jp>
  • Loading branch information
2 people authored and harryterkelsen committed Oct 23, 2023
1 parent 2f203f1 commit 6fb090a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,26 @@
*/
typedef NS_ENUM(NSInteger, FlutterMouseTrackingMode) {
// Hover events will never be sent to Flutter.
FlutterMouseTrackingModeNone = 0,
kFlutterMouseTrackingModeNone = 0,
// NOLINTNEXTLINE(readability-identifier-naming)
FlutterMouseTrackingModeNone __attribute__((deprecated)) = kFlutterMouseTrackingModeNone,

// Hover events will be sent to Flutter when the view is in the key window.
FlutterMouseTrackingModeInKeyWindow,
kFlutterMouseTrackingModeInKeyWindow = 1,
// NOLINTNEXTLINE(readability-identifier-naming)
FlutterMouseTrackingModeInKeyWindow
__attribute__((deprecated)) = kFlutterMouseTrackingModeInKeyWindow,

// Hover events will be sent to Flutter when the view is in the active app.
FlutterMouseTrackingModeInActiveApp,
kFlutterMouseTrackingModeInActiveApp = 2,
// NOLINTNEXTLINE(readability-identifier-naming)
FlutterMouseTrackingModeInActiveApp
__attribute__((deprecated)) = kFlutterMouseTrackingModeInActiveApp,

// Hover events will be sent to Flutter regardless of window and app focus.
FlutterMouseTrackingModeAlways,
kFlutterMouseTrackingModeAlways = 3,
// NOLINTNEXTLINE(readability-identifier-naming)
FlutterMouseTrackingModeAlways __attribute__((deprecated)) = kFlutterMouseTrackingModeAlways,
};

/**
Expand Down
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
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

0 comments on commit 6fb090a

Please sign in to comment.