From 36cbd9f6339614cdc180a346fc7c774f235db135 Mon Sep 17 00:00:00 2001
From: Peter Kirmeier <topeterk@users.noreply.github.com>
Date: Sun, 4 Dec 2022 22:03:57 +0100
Subject: [PATCH] Keep using Window Resources for SVG images App Resources are
 not loaded consistently by the Window designer Also updating SVG image colors
 would not work without changing resource loading.

---
 Business/App.xaml.cs       | 1 -
 SystemTrayMenu.csproj      | 6 ++++++
 UserInterface/Menu.xaml    | 1 -
 UserInterface/Menu.xaml.cs | 5 ++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Business/App.xaml.cs b/Business/App.xaml.cs
index d647b2c..a435703 100644
--- a/Business/App.xaml.cs
+++ b/Business/App.xaml.cs
@@ -7,7 +7,6 @@ namespace SystemTrayMenu
     using System;
     using System.Windows;
     using System.Windows.Threading;
-    using Microsoft.Win32;
     using SystemTrayMenu.Business;
     using SystemTrayMenu.Helper.Updater;
     using SystemTrayMenu.Properties;
diff --git a/SystemTrayMenu.csproj b/SystemTrayMenu.csproj
index d51e7dd..811f54a 100644
--- a/SystemTrayMenu.csproj
+++ b/SystemTrayMenu.csproj
@@ -113,6 +113,12 @@
   <ItemGroup>
     <None Remove="Resources\SystemTrayMenu.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Remove="Business\App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="Business\App.xaml" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="Clearcove.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/UserInterface/Menu.xaml b/UserInterface/Menu.xaml
index 907182c..13ff50c 100644
--- a/UserInterface/Menu.xaml
+++ b/UserInterface/Menu.xaml
@@ -39,7 +39,6 @@
     </Window.Triggers>
 
     <Window.Resources>
-        <!-- TODO WPF Move them into separate dictionary? -->
         <Brush x:Key="ic_fluent_svgColor">#FF585858</Brush>
         <!-- Converted SVG images using https://github.com/BerndK/SvgToXaml/releases/tag/Ver_1.3.0 -->
         <DrawingImage x:Key="ic_fluent_arrow_sync_24_regularDrawingImage">
diff --git a/UserInterface/Menu.xaml.cs b/UserInterface/Menu.xaml.cs
index fd2fc05..31fb70c 100644
--- a/UserInterface/Menu.xaml.cs
+++ b/UserInterface/Menu.xaml.cs
@@ -16,7 +16,6 @@ namespace SystemTrayMenu.UserInterface
     using SystemTrayMenu.Business;
     using SystemTrayMenu.DataClasses;
     using SystemTrayMenu.DllImports;
-    using SystemTrayMenu.Helper;
     using SystemTrayMenu.Properties;
     using SystemTrayMenu.Utilities;
     using KeyEventArgs = System.Windows.Input.KeyEventArgs;
@@ -224,13 +223,13 @@ namespace SystemTrayMenu.UserInterface
 
         internal event Action<ListView, int, MouseButtonEventArgs>? CellMouseClick;
 
-        private event RoutedEventHandler FadeIn
+        internal event RoutedEventHandler FadeIn
         {
             add { AddHandler(FadeInEvent, value); }
             remove { RemoveHandler(FadeInEvent, value); }
         }
 
-        private event RoutedEventHandler FadeOut
+        internal event RoutedEventHandler FadeOut
         {
             add { AddHandler(FadeOutEvent, value); }
             remove { RemoveHandler(FadeOutEvent, value); }