更新 v3.0.40

Coolapk-UWP · Apr 17, 2023 · 2fd6514 · 2fd6514
1 parent ab8d593
commit 2fd6514
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/CoolapkUWP/CoolapkUWP/Helpers/ThemeHelper.cs b/CoolapkUWP/CoolapkUWP/Helpers/ThemeHelper.cs
@@ -29,18 +29,20 @@ public static ElementTheme ActualTheme
         {
             get
             {
-                return CurrentApplicationWindow?.Dispatcher?.HasThreadAccess == true
-                    ? CurrentApplicationWindow?.Content is FrameworkElement rootElement
-                        && rootElement.RequestedTheme != ElementTheme.Default
-                            ? rootElement.RequestedTheme
-                            : SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme)
-                    : UIHelper.AwaitByTaskCompleteSource(() =>
-                        CurrentApplicationWindow?.Dispatcher?.AwaitableRunAsync(() =>
-                            CurrentApplicationWindow?.Content is FrameworkElement _rootElement
-                                && _rootElement.RequestedTheme != ElementTheme.Default
-                                ? _rootElement.RequestedTheme
-                                : SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme),
-                            CoreDispatcherPriority.High));
+                return CurrentApplicationWindow == null
+                    ? SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme)
+                    : CurrentApplicationWindow.Dispatcher.HasThreadAccess
+                        ? CurrentApplicationWindow.Content is FrameworkElement rootElement
+                            && rootElement.RequestedTheme != ElementTheme.Default
+                                ? rootElement.RequestedTheme
+                                : SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme)
+                        : UIHelper.AwaitByTaskCompleteSource(() =>
+                            CurrentApplicationWindow.Dispatcher.AwaitableRunAsync(() =>
+                                CurrentApplicationWindow.Content is FrameworkElement _rootElement
+                                    && _rootElement.RequestedTheme != ElementTheme.Default
+                                        ? _rootElement.RequestedTheme
+                                        : SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme),
+                                CoreDispatcherPriority.High));
             }
         }
 
@@ -53,22 +55,24 @@ public static ElementTheme RootTheme
             {
                 return CurrentApplicationWindow == null
                     ? ElementTheme.Default
-                        : CurrentApplicationWindow.Dispatcher.HasThreadAccess
+                    : CurrentApplicationWindow.Dispatcher.HasThreadAccess
                         ? CurrentApplicationWindow.Content is FrameworkElement rootElement
                             ? rootElement.RequestedTheme
                             : ElementTheme.Default
-                    : UIHelper.AwaitByTaskCompleteSource(() =>
-                        CurrentApplicationWindow.Dispatcher.AwaitableRunAsync(() =>
-                            CurrentApplicationWindow.Content is FrameworkElement _rootElement
-                                ? _rootElement.RequestedTheme
-                                : ElementTheme.Default,
-                            CoreDispatcherPriority.High));
+                        : UIHelper.AwaitByTaskCompleteSource(() =>
+                            CurrentApplicationWindow.Dispatcher.AwaitableRunAsync(() =>
+                                CurrentApplicationWindow.Content is FrameworkElement _rootElement
+                                    ? _rootElement.RequestedTheme
+                                    : ElementTheme.Default,
+                                CoreDispatcherPriority.High));
             }
             set
             {
-                _ = CurrentApplicationWindow?.Dispatcher?.AwaitableRunAsync(() =>
+                if (CurrentApplicationWindow == null) { return; }
+
+                _ = CurrentApplicationWindow.Dispatcher.AwaitableRunAsync(() =>
                 {
-                    if (CurrentApplicationWindow?.Content is FrameworkElement rootElement)
+                    if (CurrentApplicationWindow.Content is FrameworkElement rootElement)
                     {
                         rootElement.RequestedTheme = value;
                     }