From ad1779390f9131b8d0cf0a64e21855b803414c96 Mon Sep 17 00:00:00 2001
From: amwx <40413319+amwx@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:38:36 -0400
Subject: [PATCH 1/2] Add UseDarkMode property to DevToolsOptions

---
 .../Diagnostics/DevToolsOptions.cs                  |  5 +++++
 .../Diagnostics/Views/MainWindow.xaml.cs            | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 46ee8e686c..5672641602 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -41,5 +41,10 @@ namespace Avalonia.Diagnostics
         /// <remarks>Default handler is <see cref="Screenshots.FilePickerHandler"/></remarks>
         public IScreenshotHandler ScreenshotHandler { get; set; }
           = Convetions.DefaultScreenshotHandler;
+
+        /// <summary>
+        /// Gets or sets whether DevTools should use the dark mode theme
+        /// </summary>
+        public bool UseDarkMode { get; set; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index a3cff7f3d3..1e152dcdd4 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -11,6 +11,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using Avalonia.Themes.Default;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.Views
@@ -242,7 +243,17 @@ namespace Avalonia.Diagnostics.Views
 
         private void RootClosed(object? sender, EventArgs e) => Close();
 
-        public void SetOptions(DevToolsOptions options) =>
+        public void SetOptions(DevToolsOptions options)
+        {
             (DataContext as MainViewModel)?.SetOptions(options);
+
+            if (options.UseDarkMode)
+            {
+                if (Styles[0] is SimpleTheme st)
+                {
+                    st.Mode = SimpleThemeMode.Dark;
+                }                
+            }
+        }
     }
 }

From b0f2c20c37b09d0e1c1f4b7b422a3c69ac3f8feb Mon Sep 17 00:00:00 2001
From: amwx <40413319+amwx@users.noreply.github.com>
Date: Sat, 26 Mar 2022 15:31:01 -0400
Subject: [PATCH 2/2] ThicknessEditor always use black foreground for
 readibility

---
 .../Diagnostics/Views/LayoutExplorerView.axaml                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
index af6c84a76a..db48aaaa8e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -15,6 +15,7 @@
         <SolidColorBrush x:Key="PaddingHighlightBrush" Color="#CEDA8E" />
         <SolidColorBrush x:Key="SizeBackgroundBrush" Color="#88B2BD" />
         <SolidColorBrush x:Key="SizeHighlightBrush" Color="#9ED0DC" />
+        <SolidColorBrush x:Key="ThicknessEditorForeground" Color="Black" />
     </UserControl.Resources>
 
     <Grid RowDefinitions="*,Auto">
@@ -46,6 +47,7 @@
 
                 <controls:ThicknessEditor Grid.Row="0" Grid.Column="0" Header="margin" VerticalAlignment="Top"
                                           HorizontalAlignment="Center"
+                                          TextBlock.Foreground="{StaticResource ThicknessEditorForeground}"
                                           Background="{StaticResource MarginBackgroundBrush}"
                                           Highlight="{StaticResource MarginHighlightBrush}"
                                           Thickness="{Binding MarginThickness}">