Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit f1fd0a3

Browse files
matanlureycbracken
andauthored
FlutterMouse.* -> kFlutterMouse.*, so we can lint header files. (#46056)
Partial work towards flutter/flutter#134969. --------- Co-authored-by: Chris Bracken <[email protected]>
1 parent 10c4803 commit f1fd0a3

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

shell/platform/darwin/macos/framework/Headers/FlutterViewController.h

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,26 @@
1414
*/
1515
typedef NS_ENUM(NSInteger, FlutterMouseTrackingMode) {
1616
// Hover events will never be sent to Flutter.
17-
FlutterMouseTrackingModeNone = 0,
17+
kFlutterMouseTrackingModeNone = 0,
18+
// NOLINTNEXTLINE(readability-identifier-naming)
19+
FlutterMouseTrackingModeNone __attribute__((deprecated)) = kFlutterMouseTrackingModeNone,
20+
1821
// Hover events will be sent to Flutter when the view is in the key window.
19-
FlutterMouseTrackingModeInKeyWindow,
22+
kFlutterMouseTrackingModeInKeyWindow = 1,
23+
// NOLINTNEXTLINE(readability-identifier-naming)
24+
FlutterMouseTrackingModeInKeyWindow
25+
__attribute__((deprecated)) = kFlutterMouseTrackingModeInKeyWindow,
26+
2027
// Hover events will be sent to Flutter when the view is in the active app.
21-
FlutterMouseTrackingModeInActiveApp,
28+
kFlutterMouseTrackingModeInActiveApp = 2,
29+
// NOLINTNEXTLINE(readability-identifier-naming)
30+
FlutterMouseTrackingModeInActiveApp
31+
__attribute__((deprecated)) = kFlutterMouseTrackingModeInActiveApp,
32+
2233
// Hover events will be sent to Flutter regardless of window and app focus.
23-
FlutterMouseTrackingModeAlways,
34+
kFlutterMouseTrackingModeAlways = 3,
35+
// NOLINTNEXTLINE(readability-identifier-naming)
36+
FlutterMouseTrackingModeAlways __attribute__((deprecated)) = kFlutterMouseTrackingModeAlways,
2437
};
2538

2639
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ static void CommonInit(FlutterViewController* controller, FlutterEngine* engine)
400400
@"In unit tests, this is likely because either the FlutterViewController or "
401401
@"the FlutterEngine is mocked. Please subclass these classes instead.",
402402
controller.engine, controller.viewId);
403-
controller->_mouseTrackingMode = FlutterMouseTrackingModeInKeyWindow;
403+
controller->_mouseTrackingMode = kFlutterMouseTrackingModeInKeyWindow;
404404
controller->_textInputPlugin = [[FlutterTextInputPlugin alloc] initWithViewController:controller];
405405
[controller initializeKeyboard];
406406
[controller notifySemanticsEnabledChanged];
@@ -642,17 +642,17 @@ - (void)configureTrackingArea {
642642
// the view is actually loaded.
643643
return;
644644
}
645-
if (_mouseTrackingMode != FlutterMouseTrackingModeNone && self.flutterView) {
645+
if (_mouseTrackingMode != kFlutterMouseTrackingModeNone && self.flutterView) {
646646
NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
647647
NSTrackingInVisibleRect | NSTrackingEnabledDuringMouseDrag;
648648
switch (_mouseTrackingMode) {
649-
case FlutterMouseTrackingModeInKeyWindow:
649+
case kFlutterMouseTrackingModeInKeyWindow:
650650
options |= NSTrackingActiveInKeyWindow;
651651
break;
652-
case FlutterMouseTrackingModeInActiveApp:
652+
case kFlutterMouseTrackingModeInActiveApp:
653653
options |= NSTrackingActiveInActiveApp;
654654
break;
655-
case FlutterMouseTrackingModeAlways:
655+
case kFlutterMouseTrackingModeAlways:
656656
options |= NSTrackingActiveAlways;
657657
break;
658658
default:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ id MockGestureEvent(NSEventType type, NSEventPhase phase, double magnification,
195195
initWithAssetsPath:fixtures
196196
ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
197197
FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
198-
viewController.mouseTrackingMode = FlutterMouseTrackingModeInActiveApp;
199-
ASSERT_EQ(viewController.mouseTrackingMode, FlutterMouseTrackingModeInActiveApp);
198+
viewController.mouseTrackingMode = kFlutterMouseTrackingModeInActiveApp;
199+
ASSERT_EQ(viewController.mouseTrackingMode, kFlutterMouseTrackingModeInActiveApp);
200200
}
201201

202202
TEST(FlutterViewControllerTest, TestKeyEventsAreSentToFramework) {

0 commit comments

Comments
 (0)