Browse Source
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
pull/8611/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
11 deletions
-
src/Avalonia.Controls/Platform/PlatformManager.cs
|
|
|
@ -20,17 +20,8 @@ namespace Avalonia.Controls.Platform |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
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() |
|
|
|
|
