mirror of
https://github.com/Hofknecht/SystemTrayMenu.git
synced 2024-07-05 22:40:41 +12:00
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.
This commit is contained in:
parent
81e20d618b
commit
36cbd9f633
|
@ -7,7 +7,6 @@ namespace SystemTrayMenu
|
||||||
using System;
|
using System;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
using Microsoft.Win32;
|
|
||||||
using SystemTrayMenu.Business;
|
using SystemTrayMenu.Business;
|
||||||
using SystemTrayMenu.Helper.Updater;
|
using SystemTrayMenu.Helper.Updater;
|
||||||
using SystemTrayMenu.Properties;
|
using SystemTrayMenu.Properties;
|
||||||
|
|
|
@ -113,6 +113,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="Resources\SystemTrayMenu.png" />
|
<None Remove="Resources\SystemTrayMenu.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Page Remove="Business\App.xaml" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ApplicationDefinition Include="Business\App.xaml" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Clearcove.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Clearcove.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
</Window.Triggers>
|
</Window.Triggers>
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<!-- TODO WPF Move them into separate dictionary? -->
|
|
||||||
<Brush x:Key="ic_fluent_svgColor">#FF585858</Brush>
|
<Brush x:Key="ic_fluent_svgColor">#FF585858</Brush>
|
||||||
<!-- Converted SVG images using https://github.com/BerndK/SvgToXaml/releases/tag/Ver_1.3.0 -->
|
<!-- Converted SVG images using https://github.com/BerndK/SvgToXaml/releases/tag/Ver_1.3.0 -->
|
||||||
<DrawingImage x:Key="ic_fluent_arrow_sync_24_regularDrawingImage">
|
<DrawingImage x:Key="ic_fluent_arrow_sync_24_regularDrawingImage">
|
||||||
|
|
|
@ -16,7 +16,6 @@ namespace SystemTrayMenu.UserInterface
|
||||||
using SystemTrayMenu.Business;
|
using SystemTrayMenu.Business;
|
||||||
using SystemTrayMenu.DataClasses;
|
using SystemTrayMenu.DataClasses;
|
||||||
using SystemTrayMenu.DllImports;
|
using SystemTrayMenu.DllImports;
|
||||||
using SystemTrayMenu.Helper;
|
|
||||||
using SystemTrayMenu.Properties;
|
using SystemTrayMenu.Properties;
|
||||||
using SystemTrayMenu.Utilities;
|
using SystemTrayMenu.Utilities;
|
||||||
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
|
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
|
||||||
|
@ -224,13 +223,13 @@ namespace SystemTrayMenu.UserInterface
|
||||||
|
|
||||||
internal event Action<ListView, int, MouseButtonEventArgs>? CellMouseClick;
|
internal event Action<ListView, int, MouseButtonEventArgs>? CellMouseClick;
|
||||||
|
|
||||||
private event RoutedEventHandler FadeIn
|
internal event RoutedEventHandler FadeIn
|
||||||
{
|
{
|
||||||
add { AddHandler(FadeInEvent, value); }
|
add { AddHandler(FadeInEvent, value); }
|
||||||
remove { RemoveHandler(FadeInEvent, value); }
|
remove { RemoveHandler(FadeInEvent, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
private event RoutedEventHandler FadeOut
|
internal event RoutedEventHandler FadeOut
|
||||||
{
|
{
|
||||||
add { AddHandler(FadeOutEvent, value); }
|
add { AddHandler(FadeOutEvent, value); }
|
||||||
remove { RemoveHandler(FadeOutEvent, value); }
|
remove { RemoveHandler(FadeOutEvent, value); }
|
||||||
|
|
Loading…
Reference in a new issue