[macOS] Implement dialog window #176893

knopp · 2025-10-12T10:50:30Z

Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.

List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

gemini-code-assist

Code Review

This pull request implements dialog window support for macOS and Windows. It introduces a new DialogWindowController and DialogWindow widget. The native implementations for both macOS and Windows are updated to handle dialog creation, modality, and lifecycle. This includes significant refactoring in the Windows HostWindow implementation to better separate regular and dialog window logic. The integration tests have been updated to cover dialogs, but a helper function for waiting on state changes has been replaced with Future.delayed, which could introduce flakiness. The example app for multiple windows is also updated to demonstrate dialog window usage.

fluttergithubbot · 2025-10-15T14:11:19Z

An existing Git SHA, d9541b6163d513ac111cc6a0172baa4259786dfb, was detected, and no actions were taken.

To re-trigger presubmits after closing or re-opeing a PR, or pushing a HEAD commit (i.e. with --force) that already was pushed before, push a blank commit (git commit --allow-empty -m "Trigger Build") or rebase to continue.

justinmc · 2025-10-21T22:24:13Z

@knopp FYI lots of conflicts on this now.

flutter-dashboard · 2025-10-24T15:01:47Z

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

mattkae

A few comments!

mattkae · 2025-10-27T19:48:49Z

engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.mm

+        parent = owner.window;
+        break;
+      }
+    }


Should we the error log if we don't find the parent?

Still have this comment^

mattkae · 2025-10-27T19:50:32Z

packages/flutter/lib/src/widgets/_window_macos.dart

+  final WindowingOwnerMacOS _owner;
+  final DialogWindowControllerDelegate _delegate;
+  late final NativeCallable<Void Function()> _onClose;
+  late final NativeCallable<Void Function()> _onResize;


Can we move these variables up near _destroyed?

This still stands

I'll do that in the tooltip PR, otherwise it will just add more work during rebase.

packages/flutter/lib/src/widgets/_window_macos.dart

mattkae · 2025-10-27T19:53:09Z

packages/flutter/lib/src/widgets/_window_macos.dart

+
+  @override
+  void setMinimized(bool minimized) {
+    _ensureNotDestroyed();


Should we check if parent is set and not do the minimization if that is the case?

This question to

packages/flutter/lib/src/widgets/_window_macos.dart

Saviq · 2025-10-28T11:04:05Z

There's a ghost (modal) Dialog left if you kill its parent via the trashcan:

mattkae

This works, but I don't think that modal dialogs should be minimizable

mattkae · 2025-10-29T19:03:10Z

engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.mm

+        parent = owner.window;
+        break;
+      }
+    }


Still have this comment^

mattkae · 2025-10-29T19:08:07Z

packages/flutter/lib/src/widgets/_window_macos.dart

+  final WindowingOwnerMacOS _owner;
+  final DialogWindowControllerDelegate _delegate;
+  late final NativeCallable<Void Function()> _onClose;
+  late final NativeCallable<Void Function()> _onResize;


This still stands

mattkae · 2025-10-29T19:08:17Z

packages/flutter/lib/src/widgets/_window_macos.dart

+
+  @override
+  void setMinimized(bool minimized) {
+    _ensureNotDestroyed();


This question to

hellohuanlin · 2025-11-06T22:33:04Z

@knopp From triage meeting - hi could you fill up the PR description and the checkboxes?

Co-authored-by: Matthew Kosarek <[email protected]>

…#10455) Manual roll Flutter from 9b5ad8031646 to cc14ef529014 (143 revisions) Manual roll requested by [email protected] flutter/flutter@9b5ad80...cc14ef5 2025-11-17 [email protected] [ Widget Preview ] Fix crash when `widget_preview_scaffold/.dart_tool` doesn't exist (flutter/flutter#178662) 2025-11-17 [email protected] Dev proxy correctly copy query parameters from original request (flutter/flutter#178162) 2025-11-17 [email protected] Roll Dart SDK from ac5942fe75d0 to cf94632d94a1 (1 revision) (flutter/flutter#178664) 2025-11-17 [email protected] Improve code quality `FlutterViewTest.java` (flutter/flutter#178594) 2025-11-17 [email protected] Roll customer tests (flutter/flutter#178652) 2025-11-17 [email protected] Corrects invalid Flutter wiki links (flutter/flutter#178158) 2025-11-17 [email protected] Fix LateInitializationError in didChangeTextScaleFactor code example. (flutter/flutter#178375) 2025-11-17 [email protected] Roll Skia from d877de9fc23e to 84c83c0dfb4a (3 revisions) (flutter/flutter#178653) 2025-11-17 [email protected] Small refactor in `DartMessenger.java` to use method reference (flutter/flutter#178584) 2025-11-17 [email protected] fix typos in `PlatformChannel.java‎` docs (flutter/flutter#178589) 2025-11-17 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Enable UIScene Migration and update create templates (#178328)" (flutter/flutter#178665) 2025-11-17 [email protected] Remove unnecessary `String.valueOf` in `‎ListenableEditingState.java‎` (flutter/flutter#178597) 2025-11-17 [email protected] Update `Metadata.java‎` to use `getBytes` in a static context (flutter/flutter#178587) 2025-11-17 [email protected] Reduce the data copying in CanvasPath related to the SkPathBuilder API migration (flutter/flutter#178512) 2025-11-17 [email protected] Roll Packages from 799b62c to ce44ebb (10 revisions) (flutter/flutter#178649) 2025-11-17 [email protected] Enable UIScene Migration and update create templates (flutter/flutter#178328) 2025-11-17 [email protected] Roll Skia from 5fb44352b232 to d877de9fc23e (1 revision) (flutter/flutter#178647) 2025-11-17 [email protected] Revert "Separate copying dsym into its own target (#178261)" (flutter/flutter#178545) 2025-11-17 [email protected] [web] Reduce Skwasm test shards to 2 (flutter/flutter#178239) 2025-11-17 [email protected] Roll Dart SDK from ee793f732959 to ac5942fe75d0 (1 revision) (flutter/flutter#178637) 2025-11-17 [email protected] Roll Skia from b30859d35b89 to 5fb44352b232 (1 revision) (flutter/flutter#178636) 2025-11-17 [email protected] Roll Skia from 5b7f8f61528e to b30859d35b89 (1 revision) (flutter/flutter#178634) 2025-11-17 [email protected] Roll Skia from aad0515710a9 to 5b7f8f61528e (7 revisions) (flutter/flutter#178631) 2025-11-17 [email protected] Roll Skia from 761e1fe67e15 to aad0515710a9 (1 revision) (flutter/flutter#178624) 2025-11-16 [email protected] Roll Skia from 5f9157717150 to 761e1fe67e15 (1 revision) (flutter/flutter#178614) 2025-11-16 [email protected] Roll Skia from 1b435b65e754 to 5f9157717150 (1 revision) (flutter/flutter#178612) 2025-11-16 [email protected] Roll Dart SDK from dffc5f3f9be6 to ee793f732959 (1 revision) (flutter/flutter#178607) 2025-11-16 [email protected] Roll Skia from ce2168cf2b6c to 1b435b65e754 (1 revision) (flutter/flutter#178604) 2025-11-15 [email protected] Roll Dart SDK from 50eca21d80c4 to dffc5f3f9be6 (1 revision) (flutter/flutter#178603) 2025-11-15 [email protected] [macOS] Implement dialog window (flutter/flutter#176893) 2025-11-15 [email protected] Roll Dart SDK from f6f88ed5e5a1 to 50eca21d80c4 (1 revision) (flutter/flutter#178599) 2025-11-15 [email protected] Roll Dart SDK from 9eda5b525ca9 to f6f88ed5e5a1 (1 revision) (flutter/flutter#178576) 2025-11-15 [email protected] Roll Skia from c5c3399b3a84 to ce2168cf2b6c (1 revision) (flutter/flutter#178577) 2025-11-15 [email protected] Add a `RepeatingAnimationBuilder` API (flutter/flutter#174014) 2025-11-15 [email protected] Roll Dart SDK from 486be9c17488 to 9eda5b525ca9 (1 revision) (flutter/flutter#178562) 2025-11-15 [email protected] Roll Skia from f5d29842bf45 to c5c3399b3a84 (1 revision) (flutter/flutter#178559) 2025-11-14 [email protected] Roll Skia from f58b1b8052a2 to f5d29842bf45 (3 revisions) (flutter/flutter#178556) 2025-11-14 [email protected] Roll Dart SDK from c6c5f6c169a9 to 486be9c17488 (1 revision) (flutter/flutter#178555) 2025-11-14 [email protected] [ Widget Preview ] Gracefully handle unexpected analysis context disposal (flutter/flutter#178550) 2025-11-14 [email protected] docs: Add documentation for running devicelab tests in a PR (flutter/flutter#178554) 2025-11-14 [email protected] [Reland] Generate new Gradle lockfiles and delete ignore files (flutter/flutter#178553) 2025-11-14 [email protected] Fix crash when doing a SaveLayer under a non-invertible transform (flutter/flutter#178507) 2025-11-14 [email protected] [Reland] Generate ignore lockfiles and Update Android Embedder Dependencies (flutter/flutter#178538) 2025-11-14 [email protected] Roll Skia from 4c02d9fc79c1 to f58b1b8052a2 (1 revision) (flutter/flutter#178543) ...

*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.* *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.  [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --------- Co-authored-by: Matthew Kosarek <[email protected]>

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. engine flutter/engine related. See also e: labels. platform-windows Building on or for Windows specifically d: examples Sample code and demos a: desktop Running on desktop platform-macos labels Oct 12, 2025

gemini-code-assist bot reviewed Oct 12, 2025

View reviewed changes

knopp requested review from chinmaygarde and loic-sharma as code owners October 12, 2025 18:19

knopp force-pushed the macos_dialog branch from b66905c to d9541b6 Compare October 15, 2025 14:11

knopp force-pushed the macos_dialog branch from d9541b6 to 4b65f5c Compare October 24, 2025 14:12

github-actions bot removed platform-windows Building on or for Windows specifically d: examples Sample code and demos labels Oct 24, 2025

knopp changed the title ~~WIP: [macOS] Implement dialog window~~ [macOS] Implement dialog window Oct 24, 2025

mattkae self-requested a review October 27, 2025 19:47

mattkae requested changes Oct 27, 2025

View reviewed changes

mattkae approved these changes Oct 29, 2025

View reviewed changes

knopp force-pushed the macos_dialog branch from 32cfcd9 to 1e308f6 Compare November 1, 2025 12:37

knopp force-pushed the macos_dialog branch from 1e308f6 to d3400c2 Compare November 13, 2025 15:25

knopp and others added 6 commits November 15, 2025 18:02

[macOS] Implement dialog window

410717a

Apply suggestion from @mattkae

2c0c33e

Co-authored-by: Matthew Kosarek <[email protected]>

Apply suggestion from @mattkae

ac7e179

Co-authored-by: Matthew Kosarek <[email protected]>

Update packages/flutter/lib/src/widgets/_window_macos.dart

ff86734

Co-authored-by: Matthew Kosarek <[email protected]>

fix

7a97c03

Fix child window zombie when parent gets destroyed.

2dbcf54

Disable fullscreen and minimize for dialogs

1e8cdc1

knopp force-pushed the macos_dialog branch from ce2666d to 1e8cdc1 Compare November 15, 2025 17:02

knopp added this pull request to the merge queue Nov 15, 2025

Merged via the queue into flutter:master with commit ee9e4c0 Nov 15, 2025
184 checks passed

knopp deleted the macos_dialog branch November 15, 2025 21:32

engine-flutter-autoroll mentioned this pull request Nov 16, 2025

Roll Flutter from 9b5ad8031646 to 0924c0c2bb0e (117 revisions) flutter/packages#10441

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 16, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

a9c1111

engine-flutter-autoroll mentioned this pull request Nov 16, 2025

Roll Flutter from 9b5ad8031646 to 505aa720015a (118 revisions) flutter/packages#10442

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 16, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

0fcba32

engine-flutter-autoroll mentioned this pull request Nov 16, 2025

Roll Flutter from 9b5ad8031646 to f954fb79dd15 (119 revisions) flutter/packages#10444

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 16, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

ac54ed5

engine-flutter-autoroll mentioned this pull request Nov 17, 2025

Roll Flutter from 9b5ad8031646 to 40f3b2e6e6a9 (123 revisions) flutter/packages#10447

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 17, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

5751389

engine-flutter-autoroll mentioned this pull request Nov 17, 2025

Roll Flutter from 9b5ad8031646 to ce7d9b9882c0 (125 revisions) flutter/packages#10449

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 17, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

c5972c5

engine-flutter-autoroll mentioned this pull request Nov 17, 2025

Roll Flutter from 9b5ad8031646 to c546757beb28 (127 revisions) flutter/packages#10451

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 17, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

31a19cc

engine-flutter-autoroll mentioned this pull request Nov 17, 2025

Roll Flutter from 9b5ad8031646 to f5e649180789 (128 revisions) flutter/packages#10452

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 17, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

407cd25

engine-flutter-autoroll mentioned this pull request Nov 17, 2025

Roll Flutter from 9b5ad8031646 to 77f3aca4907f (132 revisions) flutter/packages#10453

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 17, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

7a431c0

engine-flutter-autoroll mentioned this pull request Nov 17, 2025

Manual roll Flutter from 9b5ad8031646 to cc14ef529014 (143 revisions) flutter/packages#10455

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 17, 2025

ee9e4c09c [macOS] Implement dialog window (flutter/flutter#176893)

2840353

Piinks mentioned this pull request Nov 21, 2025

Flutter Notable Commits - 2025 #161460

Open

[macOS] Implement dialog window #176893

[macOS] Implement dialog window #176893

Uh oh!

Conversation

knopp commented Oct 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

fluttergithubbot commented Oct 15, 2025

Uh oh!

justinmc commented Oct 21, 2025

Uh oh!

flutter-dashboard bot commented Oct 24, 2025

Uh oh!

mattkae left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Saviq commented Oct 28, 2025

Uh oh!

mattkae left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hellohuanlin commented Nov 6, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

knopp commented Oct 12, 2025 •

edited

Loading