Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't throw exceptions for missing windowing platform since it's actually not mandatory for TrayIcon #8604

Merged
merged 3 commits into from
Jul 27, 2022
Merged

Don't throw exceptions for missing windowing platform since it's actually not mandatory for TrayIcon #8604

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d232a9
Don't throw exceptions for missing windowing platform since it's actu…
kekekeks Jul 26, 2022
1aff496
More one liners for the god of one liners
kekekeks Jul 26, 2022
7315bc2
Merge branch 'master' into feature/tray-icon-non-mandatory
maxkatz6 Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/Avalonia.Controls/Platform/PlatformManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down