-
Notifications
You must be signed in to change notification settings - Fork 414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add initial support for Multiple Windows on MacOS #2260
Open
ne0rrmatrix
wants to merge
17
commits into
CommunityToolkit:main
Choose a base branch
from
ne0rrmatrix:AddSupportMacOSMultiWindow
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+47
−1
Open
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
6401190
Add initial support for Multiple Windows on MacOS
ne0rrmatrix e35a411
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 25612f3
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 85c4b2d
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 69134a0
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 1c3a03b
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 861a8ea
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 04a03c0
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix e22d3b8
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix dc85c90
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 9dc8ff2
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 19d39a3
Fix merge conflicts
ne0rrmatrix 8b2b05c
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix a32b73e
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix a3f64ec
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix 393d6ee
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix bb5a5d6
Merge branch 'main' into AddSupportMacOSMultiWindow
ne0rrmatrix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. |
||
} | ||
}; | ||
return window; | ||
} | ||
|
||
#else | ||
protected override Window CreateWindow(IActivationState? activationState) => new(appShell); | ||
#endif | ||
} |
This file contains 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
12 changes: 12 additions & 0 deletions
12
samples/CommunityToolkit.Maui.Sample/Platforms/MacCatalyst/SceneDelegate.cs
This file contains 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 | ||
{ | ||
} |
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
appShell
is not passed in? Again honest question.