From 2d251b04fb5197b18dc993f3bc7f7e5b732ff94e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 30 Jan 2022 18:09:46 +0100 Subject: [PATCH] Fix nullability error from Avalonia.Web.Blazor. --- .../ApplicationLifetimes/ISingleViewApplicationLifetime.cs | 2 +- .../Diagnostics/ViewModels/LogicalTreeNode.cs | 3 ++- .../Diagnostics/ViewModels/VisualTreeNode.cs | 3 ++- src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs index eb451f51af..e25815602e 100644 --- a/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs +++ b/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs @@ -2,6 +2,6 @@ namespace Avalonia.Controls.ApplicationLifetimes { public interface ISingleViewApplicationLifetime : IApplicationLifetime { - Control MainView { get; set; } + Control? MainView { get; set; } } } diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs index d627eba154..e8a5076c36 100644 --- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs +++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs @@ -67,7 +67,8 @@ namespace Avalonia.Diagnostics.ViewModels protected override void Initialize(AvaloniaList nodes) { - if (_application.ApplicationLifetime is Lifetimes.ISingleViewApplicationLifetime single) + if (_application.ApplicationLifetime is Lifetimes.ISingleViewApplicationLifetime single && + single.MainView is not null) { nodes.Add(new LogicalTreeNode(single.MainView, Owner)); } diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs index 5e1128d4b7..819a203d62 100644 --- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs +++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs @@ -167,7 +167,8 @@ namespace Avalonia.Diagnostics.ViewModels protected override void Initialize(AvaloniaList nodes) { - if (_application.ApplicationLifetime is Lifetimes.ISingleViewApplicationLifetime single) + if (_application.ApplicationLifetime is Lifetimes.ISingleViewApplicationLifetime single && + single.MainView is not null) { nodes.Add(new VisualTreeNode(single.MainView, Owner)); } diff --git a/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs b/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs index 3cadbfaa60..209a635a7b 100644 --- a/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs +++ b/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs @@ -135,7 +135,7 @@ namespace Avalonia.Web.Blazor public PixelPoint PointToScreen(Point point) => new PixelPoint((int)point.X, (int)point.Y); - public void SetCursor(ICursorImpl cursor) + public void SetCursor(ICursorImpl? cursor) { var val = (cursor as CssCursor)?.Value ?? CssCursor.Default; if (_currentCursor != val)