Merge pull request #5 from Clrs17/main

Fix CoreWindow creation

CoreAppUWP/App.xaml.cs

@@ -3,6 +3,7 @@
 using CoreAppUWP.Pages;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;
 using System;
 using Windows.ApplicationModel.Core;
@@ -90,7 +91,7 @@ private void EnsureWindow(LaunchActivatedEventArgs e)
                 // 当导航堆栈尚未还原时，导航到第一页，
                 // 并通过将所需信息作为导航参数传入来配置
                 // 参数
-                rootFrame.Navigate(typeof(MainPage), e);
+                rootFrame.Navigate(typeof(MainPage), e, new DrillInNavigationTransitionInfo());
                 BackdropHelper.SetBackdrop(window, SettingsHelper.Get<BackdropType>(SettingsHelper.SelectedBackdrop));
             }
 

CoreAppUWP/Controls/DesktopWindow.cs

@@ -189,7 +189,11 @@ public static Task<DesktopWindow> CreateAsync(DispatcherQueue dispatcherQueue, A
         /// <summary>
         /// Attempts to activate the application window by bringing it to the foreground and setting the input focus to it.
         /// </summary>
-        public void Activate() => AppWindow.Show();
+        public void Activate()
+        {
+            AppWindow.Show();
+            AppWindow.MoveInZOrderAtTop();
+        }
 
         /// <summary>
         /// Closes the application window.

CoreAppUWP/Helpers/BackdropHelper.cs

@@ -308,9 +308,9 @@ public static void SetAllBackdrop(BackdropType type)
         {
             ActiveWindows.Values.ForEach(async x =>
             {
-                if (x.window.Dispatcher?.HasThreadAccess == false)
+                if (x.window.DispatcherQueue?.HasThreadAccess == false)
                 {
-                    await x.window.Dispatcher.ResumeForegroundAsync();
+                    await x.window.DispatcherQueue.ResumeForegroundAsync();
                 }
                 x.SetBackdrop(type);
             });

CoreAppUWP/Helpers/ThemeHelper.cs

@@ -1,13 +1,14 @@
-using CoreAppUWP.Common;
+using CommunityToolkit.WinUI;
+using CoreAppUWP.Common;
 using CoreAppUWP.Controls;
 using Microsoft.UI;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
 using Windows.UI;
-using Windows.UI.Core;
 using Windows.UI.ViewManagement;
 
 namespace CoreAppUWP.Helpers
@@ -20,7 +21,8 @@ public static class ThemeHelper
         private static Window CurrentApplicationWindow;
 
         // Keep reference so it does not get optimized/garbage collected
-        public static UISettings UISettings { get; private set; }
+        public static UISettings UISettings { get; } = new UISettings();
+        public static AccessibilitySettings AccessibilitySettings { get; } = new AccessibilitySettings();
 
         public static WeakEvent<bool> UISettingChanged { get; } = [];
 
@@ -38,13 +40,13 @@ public static ElementTheme GetActualTheme() =>
         public static ElementTheme GetActualTheme(Window window) =>
             window == null
                 ? SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme)
-                : window.Dispatcher?.HasThreadAccess == false
-                    ? window.Dispatcher?.AwaitableRunAsync(() =>
+                : window.DispatcherQueue?.HasThreadAccess == false
+                    ? window.DispatcherQueue?.EnqueueAsync(() =>
                         window.Content is FrameworkElement _rootElement
                             && _rootElement.RequestedTheme != ElementTheme.Default
                                 ? _rootElement.RequestedTheme
                                 : SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme),
-                        CoreDispatcherPriority.High)?.AwaitByTaskCompleteSource()
+                        DispatcherQueuePriority.High)?.AwaitByTaskCompleteSource()
                         ?? SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme)
                     : window.Content is FrameworkElement rootElement
                         && rootElement.RequestedTheme != ElementTheme.Default
@@ -57,13 +59,13 @@ public static Task<ElementTheme> GetActualThemeAsync() =>
         public static async Task<ElementTheme> GetActualThemeAsync(Window window) =>
             window == null
                 ? SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme)
-                : window.Dispatcher?.HasThreadAccess == false
-                    ? await window.Dispatcher?.AwaitableRunAsync(() =>
+                : window.DispatcherQueue?.HasThreadAccess == false
+                    ? await window.DispatcherQueue?.EnqueueAsync(() =>
                         window.Content is FrameworkElement _rootElement
                             && _rootElement.RequestedTheme != ElementTheme.Default
                                 ? _rootElement.RequestedTheme
                                 : SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme),
-                            CoreDispatcherPriority.High)
+                            DispatcherQueuePriority.High)
                     : window.Content is FrameworkElement rootElement
                         && rootElement.RequestedTheme != ElementTheme.Default
                             ? rootElement.RequestedTheme
@@ -88,39 +90,39 @@ public static ElementTheme GetRootTheme() =>
         public static ElementTheme GetRootTheme(Window window) =>
             window == null
                 ? ElementTheme.Default
-                : window.Dispatcher.HasThreadAccess
+                : window.DispatcherQueue.HasThreadAccess
                     ? window.Content is FrameworkElement rootElement
                         ? rootElement.RequestedTheme
                         : ElementTheme.Default
-                    : window.Dispatcher.AwaitableRunAsync(() =>
+                    : window.DispatcherQueue.EnqueueAsync(() =>
                         window.Content is FrameworkElement _rootElement
                             ? _rootElement.RequestedTheme
                             : ElementTheme.Default,
-                        CoreDispatcherPriority.High).AwaitByTaskCompleteSource();
+                        DispatcherQueuePriority.High).AwaitByTaskCompleteSource();
 
         public static Task<ElementTheme> GetRootThemeAsync() =>
             GetRootThemeAsync(Window.Current ?? CurrentApplicationWindow);
 
         public static async Task<ElementTheme> GetRootThemeAsync(Window window) =>
             window == null
                 ? ElementTheme.Default
-                : window.Dispatcher.HasThreadAccess
+                : window.DispatcherQueue.HasThreadAccess
                     ? window.Content is FrameworkElement rootElement
                         ? rootElement.RequestedTheme
                         : ElementTheme.Default
-                    : await window.Dispatcher.AwaitableRunAsync(() =>
+                    : await window.DispatcherQueue.EnqueueAsync(() =>
                         window.Content is FrameworkElement _rootElement
                             ? _rootElement.RequestedTheme
                             : ElementTheme.Default,
-                        CoreDispatcherPriority.High);
+                        DispatcherQueuePriority.High);
 
         public static async void SetRootTheme(ElementTheme value)
         {
             WindowHelper.ActiveWindows.Values.ForEach(async window =>
             {
-                if (!window.Dispatcher.HasThreadAccess)
+                if (window.DispatcherQueue?.HasThreadAccess == false)
                 {
-                    await window.Dispatcher.ResumeForegroundAsync();
+                    await window.DispatcherQueue.ResumeForegroundAsync();
                 }
 
                 if (window.Content is FrameworkElement rootElement)
@@ -151,9 +153,9 @@ public static async Task SetRootThemeAsync(ElementTheme value)
         {
             await Task.WhenAll(WindowHelper.ActiveWindows.Values.Select(async window =>
             {
-                if (!window.Dispatcher.HasThreadAccess)
+                if (window.DispatcherQueue?.HasThreadAccess == false)
                 {
-                    await window.Dispatcher.ResumeForegroundAsync();
+                    await window.DispatcherQueue.ResumeForegroundAsync();
                 }
 
                 if (window.Content is FrameworkElement rootElement)
@@ -189,7 +191,6 @@ public static void Initialize()
             RootTheme = SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme);
 
             // Registering to color changes, thus we notice when user changes theme system wide
-            UISettings = new UISettings();
             UISettings.ColorValuesChanged += UISettings_ColorValuesChanged;
         }
 
@@ -256,9 +257,9 @@ public static void UpdateExtendViewIntoTitleBar(bool IsExtendsTitleBar)
         {
             WindowHelper.ActiveWindows.Values.ForEach(async window =>
             {
-                if (window.Dispatcher?.HasThreadAccess == false)
+                if (window.DispatcherQueue?.HasThreadAccess == false)
                 {
-                    await window.Dispatcher.ResumeForegroundAsync();
+                    await window.DispatcherQueue.ResumeForegroundAsync();
                 }
                 CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = IsExtendsTitleBar;
             });
@@ -278,16 +279,16 @@ public static void UpdateExtendViewIntoTitleBar(bool IsExtendsTitleBar)
         public static async void UpdateSystemCaptionButtonColors()
         {
             bool IsDark = await IsDarkThemeAsync();
-            bool IsHighContrast = new AccessibilitySettings().HighContrast;
+            bool IsHighContrast = AccessibilitySettings.HighContrast;
 
             Color ForegroundColor = IsDark || IsHighContrast ? Colors.White : Colors.Black;
             Color BackgroundColor = IsHighContrast ? Color.FromArgb(255, 0, 0, 0) : IsDark ? Color.FromArgb(255, 32, 32, 32) : Color.FromArgb(255, 243, 243, 243);
 
             WindowHelper.ActiveWindows.Values.ForEach(async window =>
             {
-                if (window.Dispatcher?.HasThreadAccess == false)
+                if (window.DispatcherQueue?.HasThreadAccess == false)
                 {
-                    await window.Dispatcher.ResumeForegroundAsync();
+                    await window.DispatcherQueue.ResumeForegroundAsync();
                 }
 
                 bool ExtendViewIntoTitleBar = CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar;
@@ -316,13 +317,13 @@ public static async void UpdateSystemCaptionButtonColors()
 
         public static async void UpdateSystemCaptionButtonColors(Window window)
         {
-            if (window.Dispatcher?.HasThreadAccess == false)
+            if (window.DispatcherQueue?.HasThreadAccess == false)
             {
-                await window.Dispatcher.ResumeForegroundAsync();
+                await window.DispatcherQueue.ResumeForegroundAsync();
             }
 
             bool IsDark = window?.Content is FrameworkElement rootElement ? rootElement.RequestedTheme.IsDarkTheme() : await IsDarkThemeAsync();
-            bool IsHighContrast = new AccessibilitySettings().HighContrast;
+            bool IsHighContrast = AccessibilitySettings.HighContrast;
 
             Color ForegroundColor = IsDark || IsHighContrast ? Colors.White : Colors.Black;
             Color BackgroundColor = IsHighContrast ? Color.FromArgb(255, 0, 0, 0) : IsDark ? Color.FromArgb(255, 32, 32, 32) : Color.FromArgb(255, 243, 243, 243);
@@ -345,7 +346,7 @@ public static async void UpdateSystemCaptionButtonColors(DesktopWindow window)
             }
 
             bool IsDark = window?.Content is FrameworkElement rootElement ? rootElement.RequestedTheme.IsDarkTheme() : await IsDarkThemeAsync();
-            bool IsHighContrast = new AccessibilitySettings().HighContrast;
+            bool IsHighContrast = AccessibilitySettings.HighContrast;
 
             Color ForegroundColor = IsDark || IsHighContrast ? Colors.White : Colors.Black;
             Color BackgroundColor = IsHighContrast ? Color.FromArgb(255, 0, 0, 0) : IsDark ? Color.FromArgb(255, 32, 32, 32) : Color.FromArgb(255, 243, 243, 243);

CoreAppUWP/Pages/SettingsPages/SettingsPage.xaml

@@ -119,7 +119,6 @@
                             Description="Create a new CoreWindow."
                             Header="CoreWindow"
                             IsClickEnabled="True"
-                            IsEnabled="{x:Bind IsCoreWindow}"
                             Style="{StaticResource ClickableSettingExpanderItemStyle}"
                             Tag="NewWindow" />
                         <controls:Setting
@@ -139,6 +138,7 @@
                         Description="Show settings charm pane."
                         Header="Open Settings"
                         IsClickEnabled="True"
+                        IsEnabled="{x:Bind IsCoreWindow}"
                         Tag="SettingsFlyout">
                         <controls:Setting.Icon>
                             <AnimatedIcon>
@@ -158,6 +158,7 @@
                         Description="Show search charm pane."
                         Header="Open Search"
                         IsClickEnabled="True"
+                        IsEnabled="{x:Bind IsCoreWindow}"
                         Tag="SearchFlyout">
                         <controls:Setting.Icon>
                             <AnimatedIcon>

CoreAppUWP/Pages/SettingsPages/SettingsPage.xaml.cs

@@ -91,15 +91,16 @@ private async void Button_Click(object sender, RoutedEventArgs e)
                     else if (this.GetWindowForElement() is DesktopWindow desktopWindow)
                     { desktopWindow.AppWindow.SetPresenter(AppWindowPresenterKind.CompactOverlay); }
                     break;
-                case "NewWindow" when IsCoreWindow:
+                case "NewWindow":
                     _ = await WindowHelper.CreateWindowAsync(window =>
                     {
                         if (SettingsHelper.Get<bool>(SettingsHelper.IsExtendsTitleBar))
                         { CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = true; }
                         Frame _frame = new();
                         window.Content = _frame;
                         ThemeHelper.Initialize(window);
-                        _ = _frame.Navigate(typeof(MainPage), null, new DrillInNavigationTransitionInfo());
+                        try { _ = _frame.Navigate(typeof(MainPage), null, new DrillInNavigationTransitionInfo()); }
+                        catch { _ = _frame.Navigate(typeof(MainPage)); }
                         BackdropHelper.SetBackdrop(window, SettingsHelper.Get<BackdropType>(SettingsHelper.SelectedBackdrop));
                     });
                     break;
@@ -118,7 +119,7 @@ private async void Button_Click(object sender, RoutedEventArgs e)
                     AppWindow appWindow = window.AppWindow;
                     appWindow.Title = Package.Current.DisplayName;
                     appWindow.SetIcon("favicon.ico");
-                    appWindow.Show();
+                    window.Activate();
                     break;
                 case "SearchFlyout" when SettingsPaneRegister.IsSearchPaneSupported:
                     SearchPane.GetForCurrentView().Show();