Move activator to App's OnLaunched() override

CollapseLauncher · Jun 22, 2024 · 2fb7f90 · 2fb7f90
1 parent a37d229
commit 2fb7f90
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/CollapseLauncher/App.xaml.cs b/CollapseLauncher/App.xaml.cs
@@ -23,12 +23,32 @@ public partial class App
 
         public App()
         {
-            try
+            if (DebugSettings != null)
             {
-                DebugSettings!.XamlResourceReferenceFailed += (sender, args) => { LogWriteLine($"[XAML_RES_REFERENCE] Sender: {sender}\r\n{args!.Message}", LogType.Error, true); };
+#if ENABLEFRAMECOUNTER
+                DebugSettings.EnableFrameRateCounter = true;
+#endif
+#if DEBUG
+                DebugSettings.LayoutCycleDebugBreakLevel = LayoutCycleDebugBreakLevel.High;
+                DebugSettings.LayoutCycleTracingLevel = LayoutCycleTracingLevel.High;
+                DebugSettings.IsXamlResourceReferenceTracingEnabled = true;
+                DebugSettings.IsBindingTracingEnabled = true;
+#endif
+                DebugSettings.XamlResourceReferenceFailed += (sender, args) => { LogWriteLine($"[XAML_RES_REFERENCE] Sender: {sender}\r\n{args!.Message}", LogType.Error, true); };
                 DebugSettings.BindingFailed += (sender, args) => { LogWriteLine($"[XAML_BINDING] Sender: {sender}\r\n{args!.Message}", LogType.Error, true); };
                 UnhandledException += (sender, e) => { LogWriteLine($"[XAML_OTHER] Sender: {sender}\r\n{e!.Exception} {e.Exception!.InnerException}", LogType.Error, true); };
-
+            }
+
+            RequestedTheme = IsAppThemeLight ? ApplicationTheme.Light : ApplicationTheme.Dark;
+            SetPreferredAppMode(ShouldAppsUseDarkMode() ? PreferredAppMode.AllowDark : PreferredAppMode.Default);
+
+            this.InitializeComponent();
+        }
+
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            try
+            {
                 ThemeChangerInvoker.ThemeEvent += (_, _) => {
                     WindowUtility.ApplyWindowTitlebarLegacyColor();
                     bool isThemeLight = IsAppThemeLight;
@@ -39,11 +59,8 @@ public App()
                     WindowUtility.CurrentAppWindow!.TitleBar!.ButtonInactiveBackgroundColor = color;
 
                     if (WindowUtility.CurrentWindow!.Content is not null and FrameworkElement frameworkElement)
-                        frameworkElement.RequestedTheme = isThemeLight ? ElementTheme.Light : ElementTheme.Dark; };
-
-                this.InitializeComponent();
-                RequestedTheme = IsAppThemeLight ? ApplicationTheme.Light : ApplicationTheme.Dark;
-                SetPreferredAppMode(ShouldAppsUseDarkMode() ? PreferredAppMode.AllowDark : PreferredAppMode.Default);
+                        frameworkElement.RequestedTheme = isThemeLight ? ElementTheme.Light : ElementTheme.Dark;
+                };
 
                 Window toInitializeWindow = null;
                 switch (m_appMode)