marketally/marketally.mopups
2
0
Fork 0
Code Issues Packages Releases Wiki

Open popups on the main application window

Browse Source
This commit is contained in:
Tor Øyvind Fluør
2024-06-21 09:56:04 +02:00
parent 44b6af7579
commit e96ea59e84
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Mopups/Mopups.Maui/Platforms/MacCatalyst/MacOSMopups.cs
View File

@@ -1,7 +1,7 @@
using CoreGraphics;
using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
using Microsoft.Maui.Platform;
using Mopups.Interfaces;
using Mopups.Pages;
using Mopups.Platforms.MacCatalyst;
@@ -36,7 +36,16 @@ internal class MacOSMopups : IPopupPlatform
if (IsiOS13OrNewer)
{
var connectedScene = UIApplication.SharedApplication.ConnectedScenes.ToArray().FirstOrDefault(x => x.ActivationState == UISceneActivationState.ForegroundActive);
UIScene connectedScene = null;
if(page.Parent != null && page.Parent.Handler != null && page.Parent.Handler.MauiContext != null) {
var nativeMainPage = page.Parent.ToPlatform(page.Parent.Handler.MauiContext);
connectedScene = nativeMainPage.Window.WindowScene;
}
if(connectedScene == null)
connectedScene = UIApplication.SharedApplication.ConnectedScenes.ToArray().FirstOrDefault(x => x.ActivationState == UISceneActivationState.ForegroundActive);
if (connectedScene != null && connectedScene is UIWindowScene windowScene)
window = new PopupWindow(windowScene);
else

6
Mopups/Mopups.Maui/Platforms/iOS/iOSMopups.cs
View File

@@ -30,7 +30,10 @@ internal class iOSMopups : IPopupPlatform
if (IsiOS13OrNewer)
{
var connectedScene = UIApplication.SharedApplication.ConnectedScenes.ToArray().FirstOrDefault(x => x.ActivationState == UISceneActivationState.ForegroundActive);
var connectedScene = UIApplication.SharedApplication.ConnectedScenes.ToArray()
.Where(scene => scene.Session.Role == UIWindowSceneSessionRole.Application)
.FirstOrDefault(x => x.ActivationState == UISceneActivationState.ForegroundActive);
if (connectedScene != null && connectedScene is UIWindowScene windowScene)
window = new PopupWindow(windowScene);
else
@@ -65,6 +68,7 @@ internal class iOSMopups : IPopupPlatform
.ConnectedScenes
.ToArray()
.OfType<UIWindowScene>()
.Where(scene => scene.Session.Role == UIWindowSceneSessionRole.Application)
.SelectMany(scene => scene.Windows)
.FirstOrDefault(window => window.IsKeyWindow);