From 215425c45a02bd7c0cad7a881d198a4fbac66568 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Mon, 27 Dec 2021 12:17:37 +0100
Subject: [PATCH] fixes(DevTools): NRE when click 'Visualizze dirty rects' and
 'Show fps overly' in Option menu

---
 .../Diagnostics/Controls/Application.cs       | 12 ++++++-
 .../Diagnostics/ViewModels/MainViewModel.cs   | 32 +++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
index b2f2974440..316e31b37e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
@@ -28,7 +28,12 @@ namespace Avalonia.Diagnostics.Controls
                 };
                 controller.Exit += eh;
             }
-
+            RendererRoot = application.ApplicationLifetime switch
+            {
+                Lifetimes.IClassicDesktopStyleApplicationLifetime classic => classic.MainWindow.Renderer,
+                Lifetimes.ISingleViewApplicationLifetime single => (single.MainView as VisualTree.IVisual)?.VisualRoot?.Renderer,
+                _ => null
+            };
         }
 
         internal App Instance => _application;
@@ -105,5 +110,10 @@ namespace Avalonia.Diagnostics.Controls
         /// </summary>
         public string? Name =>
             _application.Name;
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        internal Rendering.IRenderer? RendererRoot { get; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index d809768a47..c607542991 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -76,7 +76,20 @@ namespace Avalonia.Diagnostics.ViewModels
             get => _shouldVisualizeDirtyRects;
             set
             {
-                ((TopLevel)_root).Renderer.DrawDirtyRects = value;
+                var changed = true;
+                if (_root is TopLevel topLevel && topLevel.Renderer is { })
+                {
+                    topLevel.Renderer.DrawDirtyRects = value;
+                }
+                else if (_root is Controls.Application app && app.RendererRoot is { })
+                {
+                    app.RendererRoot.DrawDirtyRects = value;
+                }
+                else
+                {
+                    changed = false;
+                }
+                if (changed)
                 RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
             }
         }
@@ -96,8 +109,21 @@ namespace Avalonia.Diagnostics.ViewModels
             get => _showFpsOverlay;
             set
             {
-                ((TopLevel)_root).Renderer.DrawFps = value;
-                RaiseAndSetIfChanged(ref _showFpsOverlay, value);
+                var changed = true;
+                if (_root is TopLevel topLevel && topLevel.Renderer is { })
+                {
+                    topLevel.Renderer.DrawFps = value;
+                }
+                else if (_root is Controls.Application app && app.RendererRoot is { })
+                {
+                    app.RendererRoot.DrawFps = value;
+                }
+                else
+                {
+                    changed = false;
+                }
+                if(changed)
+                    RaiseAndSetIfChanged(ref _showFpsOverlay, value);
             }
         }