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

fixes crash when sets mouseTrackingMode before view is loaded #26576

Merged
merged 3 commits into from
Jun 4, 2021
Merged

fixes crash when sets mouseTrackingMode before view is loaded #26576

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa1d5b2
fixes crash when sets mouseTrackingMode before view is loaded
chunhtai Jun 3, 2021
20d19b0
fix build
chunhtai Jun 3, 2021
1b190b0
adding comment
chunhtai Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion 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 @@ -396,7 +396,9 @@ - (void)listenForMetaModifiedKeyUpEvents {
}

- (void)configureTrackingArea {
NSAssert(self.viewLoaded, @"View must be loaded before setting tracking area");
if (!self.viewLoaded) {
return;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What causes this to get set again when the view loads?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- (void)viewDidLoad; will call the configureTrackingArea selector

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool - maybe just mention that here in a comment? otherwise LGTM

}
if (_mouseTrackingMode != FlutterMouseTrackingModeNone && self.flutterView) {
NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
NSTrackingInVisibleRect | NSTrackingEnabledDuringMouseDrag;
Expand Down
10 changes: 10 additions & 0 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 @@ -140,6 +140,16 @@ + (void)respondFalseForSendEvent:(const FlutterKeyEvent&)event
EXPECT_EQ([window firstResponder], viewController.flutterView);
}

TEST(FlutterViewController, CanSetMouseTrackingModeBeforeViewLoaded) {
NSString* fixtures = @(testing::GetFixturesPath());
FlutterDartProject* project = [[FlutterDartProject alloc]
initWithAssetsPath:fixtures
ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
viewController.mouseTrackingMode = FlutterMouseTrackingModeInActiveApp;
ASSERT_EQ(viewController.mouseTrackingMode, FlutterMouseTrackingModeInActiveApp);
}

TEST(FlutterViewControllerTest, TestKeyEventsAreSentToFramework) {
ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testKeyEventsAreSentToFramework]);
}
Expand Down