Merge pull request #8604 from AvaloniaUI/feature/tray-icon-non-mandatory

Don't throw exceptions for missing windowing platform since it's actually not mandatory for TrayIcon
AvaloniaUI · Jul 27, 2022 · abc577f · abc577f
2 parents 4be332a + 7315bc2
commit abc577f
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs
@@ -20,17 +20,8 @@ public static void SetDesignerScalingFactor(double factor)
         {
         }
 
-        public static ITrayIconImpl? CreateTrayIcon()
-        {
-            var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
-
-            if (platform == null)
-            {
-                throw new Exception("Could not CreateTrayIcon(): IWindowingPlatform is not registered.");
-            }
-
-            return s_designerMode ? null : platform.CreateTrayIcon();
-        }
+        public static ITrayIconImpl? CreateTrayIcon() =>
+            s_designerMode ? null : AvaloniaLocator.Current.GetService<IWindowingPlatform>()?.CreateTrayIcon();
 
 
         public static IWindowImpl CreateWindow()