From 08a65eb017255cbcef0c0487984cab5ea6bb663e Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Tue, 7 May 2024 16:58:26 +0200
Subject: [PATCH] Small code improvments

---
 src/ClipCMD/App.axaml.cs                | 15 ++++++---------
 src/ClipCMD/Views/EditorWindow.axaml.cs | 10 +++++++++-
 src/ClipCMD/Views/MainWindow.axaml      |  3 +--
 src/ClipCMD/Views/MainWindow.axaml.cs   | 10 ----------
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/ClipCMD/App.axaml.cs b/src/ClipCMD/App.axaml.cs
index 524f3f5..7f8b850 100644
--- a/src/ClipCMD/App.axaml.cs
+++ b/src/ClipCMD/App.axaml.cs
@@ -36,22 +36,19 @@ public partial class App : Application
 
             desktop.MainWindow.Closing += (sender, e) =>
             {
+                e.Cancel = true;
+
+                desktop.MainWindow.Hide();
+
                 Settings.SaveSettings();
                 clipCmdCommandHandler.SaveCommands();
             };
 
             clipCmdCommandHandler.Start();
         }
-        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+        else
         {
-            /*
-            singleViewPlatform.MainView = new MainView()
-            {
-                DataContext = new MainViewModel()
-            }
-            */
-
-            throw new NotImplementedException();
+            throw new PlatformNotSupportedException();
         }
 
         base.OnFrameworkInitializationCompleted();
diff --git a/src/ClipCMD/Views/EditorWindow.axaml.cs b/src/ClipCMD/Views/EditorWindow.axaml.cs
index c2483af..79d3560 100644
--- a/src/ClipCMD/Views/EditorWindow.axaml.cs
+++ b/src/ClipCMD/Views/EditorWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
+using Avalonia.Styling;
 
 using AvaloniaEdit;
 using AvaloniaEdit.TextMate;
@@ -35,7 +36,14 @@ public partial class EditorWindow : Window
             CheckScript(editorViewModel);
         };
 
-        RegistryOptions registryOptions = new RegistryOptions(ThemeName.DarkPlus);
+        ThemeName editorTheme = ThemeName.DarkPlus;
+
+        if (Avalonia.Application.Current?.ActualThemeVariant == ThemeVariant.Light)
+        {
+            editorTheme = ThemeName.LightPlus;
+        }
+
+        RegistryOptions registryOptions = new RegistryOptions(editorTheme);
         TextMate.Installation _textMateInstallation = textEditor.InstallTextMate(registryOptions);
 
         _textMateInstallation.SetGrammar(registryOptions.GetScopeByLanguageId(registryOptions.GetLanguageByExtension(".ps1").Id));
diff --git a/src/ClipCMD/Views/MainWindow.axaml b/src/ClipCMD/Views/MainWindow.axaml
index 74a8ad7..92b5ac5 100644
--- a/src/ClipCMD/Views/MainWindow.axaml
+++ b/src/ClipCMD/Views/MainWindow.axaml
@@ -9,8 +9,7 @@
         x:Class="ClipCmd.Views.MainWindow"
         x:DataType="vm:ViewModelBase"
         Icon="/Assets/logo.ico"
-        Title="{Binding Title}" Width="800" Height="450"
-        Closing="Window_Closing">
+        Title="{Binding Title}" Width="800" Height="450">
 
     <views:MainView />
 </Window>
\ No newline at end of file
diff --git a/src/ClipCMD/Views/MainWindow.axaml.cs b/src/ClipCMD/Views/MainWindow.axaml.cs
index 04378a1..a81f742 100644
--- a/src/ClipCMD/Views/MainWindow.axaml.cs
+++ b/src/ClipCMD/Views/MainWindow.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 
 namespace ClipCmd.Views;
 
@@ -9,13 +8,4 @@ public partial class MainWindow : Window
     {
         InitializeComponent();
     }
-
-    private void Window_Closing(object? sender, WindowClosingEventArgs e)
-    {
-        if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop && desktop.MainWindow is not null)
-        {
-            desktop.MainWindow.Hide();
-            e.Cancel = true;
-        }
-    }
 }
\ No newline at end of file