From 4f97443d09811711fcac7e2903260d9821d109f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Marchal?= <me@theomarchal.com>
Date: Sat, 14 Aug 2021 12:03:09 +0200
Subject: [PATCH] Fix Systray binding errors

---
 Views/Systray.xaml        | 81 +++++++++++++++++++--------------------
 Views/SystrayViewModel.cs |  4 --
 2 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/Views/Systray.xaml b/Views/Systray.xaml
index 17c2a8f..f8ed99e 100644
--- a/Views/Systray.xaml
+++ b/Views/Systray.xaml
@@ -1,49 +1,48 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:tb="http://www.hardcodet.net/taskbar"
+                    xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
                     xmlns:local="clr-namespace:unison">
 
-    <tb:TaskbarIcon x:Name="SystrayTaskbar" xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
-            IconSource="/images/unison.ico" ToolTipText="{Binding GetAppText}" DoubleClickCommand="{Binding ShowWindowCommand}" x:Key="SystrayTaskbar">
-        <tb:TaskbarIcon.ContextMenu>
-            <ContextMenu>
-                <MenuItem IsEnabled="False">
-                    <MenuItem.Icon>
-                        <Image Source="/images/unison.ico" Width="16" Height="16"/>
-                    </MenuItem.Icon>
-                    <MenuItem.Header>
-                        <TextBlock Text="{Binding GetAppText}" />
-                    </MenuItem.Header>
-                </MenuItem>
-                <Separator />
-                <MenuItem Header="Show window" Command="{Binding ShowWindowCommand}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" emoji:Image.Source="▶️" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Name="test_snapcast_item" Header="{Binding SnapcastText}" Command="{Binding Snapcast}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" emoji:Image.Source="🔊" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <!--<MenuItem Header="Shuffle" Command="{Binding Shuffle}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" emoji:Image.Source="🔀" />
-                    </MenuItem.Icon>
-                </MenuItem>-->
-                <MenuItem Header="Settings" Command="{Binding Settings}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" emoji:Image.Source="🛠️" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-                <MenuItem Header="Exit" Command="{Binding ExitApplicationCommand}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" emoji:Image.Source="❌" />
-                    </MenuItem.Icon>
-                </MenuItem>
-            </ContextMenu>
-        </tb:TaskbarIcon.ContextMenu>
+    <ContextMenu x:Shared="false" x:Key="SystrayMenu">
+        <MenuItem IsEnabled="False">
+            <MenuItem.Icon>
+                <Image Source="/images/unison.ico" Width="16" Height="16"/>
+            </MenuItem.Icon>
+            <MenuItem.Header>
+                <TextBlock Text="{Binding GetAppText}" />
+            </MenuItem.Header>
+        </MenuItem>
+        <Separator />
+        <MenuItem Header="Show window" Command="{Binding ShowWindowCommand}">
+            <MenuItem.Icon>
+                <Image Width="16" Height="16" emoji:Image.Source="▶️" />
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Name="test_snapcast_item" Header="{Binding SnapcastText}" Command="{Binding Snapcast}">
+            <MenuItem.Icon>
+                <Image Width="16" Height="16" emoji:Image.Source="🔊" />
+            </MenuItem.Icon>
+        </MenuItem>
+        <!--<MenuItem Header="Shuffle" Command="{Binding Shuffle}">
+            <MenuItem.Icon>
+                <Image Width="16" Height="16" emoji:Image.Source="🔀" />
+            </MenuItem.Icon>
+        </MenuItem>-->
+        <MenuItem Header="Settings" Command="{Binding Settings}">
+            <MenuItem.Icon>
+                <Image Width="16" Height="16" emoji:Image.Source="🛠️" />
+            </MenuItem.Icon>
+        </MenuItem>
+        <Separator />
+        <MenuItem Header="Exit" Command="{Binding ExitApplicationCommand}">
+            <MenuItem.Icon>
+                <Image Width="16" Height="16" emoji:Image.Source="❌" />
+            </MenuItem.Icon>
+        </MenuItem>
+    </ContextMenu>
+
+    <tb:TaskbarIcon x:Key="SystrayTaskbar" IconSource="/images/unison.ico" ToolTipText="{Binding GetAppText}" DoubleClickCommand="{Binding ShowWindowCommand}" ContextMenu="{StaticResource SystrayMenu}">
         <tb:TaskbarIcon.DataContext>
             <local:SystrayViewModel />
         </tb:TaskbarIcon.DataContext>
diff --git a/Views/SystrayViewModel.cs b/Views/SystrayViewModel.cs
index 4f5a529..9ed4871 100644
--- a/Views/SystrayViewModel.cs
+++ b/Views/SystrayViewModel.cs
@@ -8,10 +8,6 @@ namespace unison
 {
     public class SystrayViewModel : INotifyPropertyChanged
     {
-        public SystrayViewModel()
-        {
-        }
-
         public string GetAppText => "unison v" + Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
 
         public ICommand ShowWindowCommand => new DelegateCommand