Add initial support for Multiple Windows on MacOS #2260
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,9 +9,26 @@ public partial class App : Application | |
| public App(AppShell appShell) | ||
| { | ||
| InitializeComponent(); | ||
| this.appShell = appShell; | ||
| } | ||
|
|
||
| #if MACCATALYST | ||
| protected override Window CreateWindow(IActivationState? activationState) | ||
| { | ||
| Window window = base.CreateWindow(activationState); | ||
| window.Destroying += (object? sender, EventArgs args) => | ||
| { | ||
| if (Current?.Windows?.Count - 1 == 0) | ||
| { | ||
| // Exit the app when the last window closes | ||
| // This ensures app closes when last window closes on Mac | ||
| Environment.Exit(0); | ||
|
There was a problem hiding this comment. Is this a correct thing to do though? I honestly don't know hence the question. I ask primarily because of this https://superuser.com/questions/53935/getting-mac-os-x-applications-to-close-after-last-window-closed/53940#53940 answer. There was a problem hiding this comment. ^^ @ne0rrmatrix friendly ping |
||
| } | ||
| }; | ||
| return window; | ||
| } | ||
|
|
||
| #else | ||
| protected override Window CreateWindow(IActivationState? activationState) => new(appShell); | ||
| #endif | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| using System; | ||
| using Foundation; | ||
| using Microsoft.Maui; | ||
| using ObjCRuntime; | ||
| using UIKit; | ||
|
|
||
| namespace CommunityToolkit.Maui.Sample.Platforms.MacCatalyst; | ||
|
|
||
| [Register("SceneDelegate")] | ||
| public class SceneDelegate : MauiUISceneDelegate | ||
| { | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, e.g., on Windows the call is
new Window(appShell)and on Mac Catalyst it isbase.CreateWindow(activationState).Is this by design that
appShellis not passed in? Again honest question.