From 2082072532dce1d86ce4c9105ba4c64e328cc33a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Marchal?= <me@theomarchal.com>
Date: Sun, 8 Jun 2025 01:29:22 +0200
Subject: [PATCH] Windows 11 design compatibility

---
 Views/MainWindow.xaml  | 10 +++++-----
 Views/Radios.xaml      |  4 ++--
 Views/Radios.xaml.cs   |  7 +++++++
 Views/Settings.xaml    | 16 ++++++++--------
 Views/Settings.xaml.cs |  7 +++++++
 Views/Shuffle.xaml     |  8 ++++----
 Views/Shuffle.xaml.cs  |  7 +++++++
 7 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml
index deb42ea..38ca78c 100644
--- a/Views/MainWindow.xaml
+++ b/Views/MainWindow.xaml
@@ -17,7 +17,7 @@
         </Style>
     </Window.Resources>
 
-    <Grid Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" MinHeight="270" MinWidth="700">
+    <Grid Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" MinHeight="270" MinWidth="700" Margin="0,10,0,0">
         <Grid x:Name="TopLayout" Margin="10,0,10,0" VerticalAlignment="Stretch" Width="Auto" Height="Auto">
             <Grid x:Name="Display" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="225,0,0,0" Height="Auto" Width="Auto">
                 <GroupBox Height="220" VerticalAlignment="Center">
@@ -114,14 +114,14 @@
             <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" VerticalAlignment="Center" Margin="10,0,0,0">
                 <Button x:Name="Shuffle" Padding="5, 2" Click="Shuffle_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" Margin="0,0,10,0">
                     <StackPanel Orientation="Horizontal">
-                        <emoji:TextBlock Text="🔁" Padding="0,0,0,2"/>
+                        <TextBlock Text="🔁" Margin="0,0,0,2"/>
                         <TextBlock Text="{x:Static properties:Resources.Shuffle}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
 
                 <Button x:Name="Radio" Padding="5, 2" HorizontalAlignment="Left" Click="Radios_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
                     <StackPanel Orientation="Horizontal">
-                        <emoji:TextBlock Text="📻" Padding="0,0,0,2"/>
+                        <TextBlock Text="📻" Padding="0,0,0,2"/>
                         <TextBlock Text="{x:Static properties:Resources.Radios}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
@@ -139,14 +139,14 @@
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,10,0">
                 <Button x:Name="Snapcast" HorizontalAlignment="Left" VerticalAlignment="Center" Click="Snapcast_Clicked" Margin="0,0,10,0" Padding="5, 2" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
                     <StackPanel Orientation="Horizontal">
-                        <emoji:TextBlock Text="🔊" Padding="0,0,0,2"/>
+                        <TextBlock Text="🔊" Padding="0,0,0,2"/>
                         <TextBlock x:Name="SnapcastText" Text="{x:Static properties:Resources.StartSnapcast}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
 
                 <Button x:Name="Settings" Padding="5, 2" Click="Settings_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}">
                     <StackPanel Orientation="Horizontal">
-                        <emoji:TextBlock Text="🛠️"  Padding="0,0,0,2"/>
+                        <TextBlock Text="🛠️" Padding="0,0,0,2"/>
                         <TextBlock Text="{x:Static properties:Resources.Settings}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
diff --git a/Views/Radios.xaml b/Views/Radios.xaml
index df6eedb..76ef4f8 100644
--- a/Views/Radios.xaml
+++ b/Views/Radios.xaml
@@ -8,13 +8,13 @@
         mc:Ignorable="d"
         Title="Radios" Closing="Window_Closing" SizeToContent="WidthAndHeight" ResizeMode="NoResize">
 
-    <Grid>
+    <Grid Margin="0,5,0,0">
         <StackPanel>
             <StackPanel HorizontalAlignment="Left" Orientation="Vertical" Margin="5,0,5,0">
                 <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                     <GroupBox.Header>
                         <TextBlock>
-                            <emoji:EmojiInline Text="📻"/>
+                            <Run Text="📻"/>
                             <Run Text="{x:Static properties:Resources.Radio_SearchStation}"/>
                         </TextBlock>
                     </GroupBox.Header>
diff --git a/Views/Radios.xaml.cs b/Views/Radios.xaml.cs
index 5262432..ed5fa98 100644
--- a/Views/Radios.xaml.cs
+++ b/Views/Radios.xaml.cs
@@ -172,5 +172,12 @@ namespace unison
             WindowInteropHelper helper = new(this);
             helper.EnsureHandle();
         }
+
+        private void Window_LocationChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.RadiosWindowTop = Top;
+            Properties.Settings.Default.RadiosWindowLeft = Left;
+            Properties.Settings.Default.Save();
+        }
     }
 }
\ No newline at end of file
diff --git a/Views/Settings.xaml b/Views/Settings.xaml
index 8ab2618..e8589eb 100644
--- a/Views/Settings.xaml
+++ b/Views/Settings.xaml
@@ -25,7 +25,7 @@
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
                                 <TextBlock>
-                                    <emoji:EmojiInline Text="📶"/>
+                                    <Run Text="📶"/>
                                     <Run Text="{x:Static properties:Resources.Settings_Connection}"/>
                                 </TextBlock>
                             </GroupBox.Header>
@@ -64,7 +64,7 @@
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
                                 <TextBlock>
-                                    <emoji:EmojiInline Text="⌨️ "/>
+                                    <Run Text="⌨️"/>
                                     <Run Text="{x:Static properties:Resources.Settings_Shortcuts}"></Run>
                                 </TextBlock>
                             </GroupBox.Header>
@@ -170,7 +170,7 @@
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
-                                <emoji:TextBlock Text="🔊 Snapcast"/>
+                                <Run Text="🔊 Snapcast"/>
                             </GroupBox.Header>
                             <Grid VerticalAlignment="Top">
                                 <StackPanel>
@@ -201,8 +201,8 @@
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
                                 <TextBlock>
-                                    <emoji:EmojiInline Text="🔁 "/>
-                                    <Run Text="{x:Static properties:Resources.Shuffle}"></Run>
+                                    <Run Text="🔁"/>
+                                    <Run Text="{x:Static properties:Resources.Shuffle}"/>
                                 </TextBlock>
                             </GroupBox.Header>
                             <Grid MaxWidth="500">
@@ -230,7 +230,7 @@
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
                                 <TextBlock>
-                                    <emoji:EmojiInline Text="📊"/>
+                                    <Run Text="📊"/>
                                     <Run Text="{x:Static properties:Resources.Database}"/>
                                 </TextBlock>
                             </GroupBox.Header>
@@ -262,7 +262,7 @@
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
-                                <emoji:TextBlock Text="🎶 unison"/>
+                                <Run Text="🎶 unison"/>
                             </GroupBox.Header>
                             <Grid VerticalAlignment="Top">
                                 <StackPanel Orientation="Vertical">
@@ -308,7 +308,7 @@
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0" Margin="0,10,0,0">
                             <GroupBox.Header>
                                 <TextBlock>
-                                    <emoji:EmojiInline Text="📝 "/>
+                                    <Run Text="📝"/>
                                     <Run Text="{x:Static properties:Resources.Settings_License}" />
                                 </TextBlock>
                             </GroupBox.Header>
diff --git a/Views/Settings.xaml.cs b/Views/Settings.xaml.cs
index 19c55cd..bef8415 100644
--- a/Views/Settings.xaml.cs
+++ b/Views/Settings.xaml.cs
@@ -207,6 +207,13 @@ namespace unison
             helper.EnsureHandle();
         }
 
+        private void Window_LocationChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.SettingsWindowTop = Top;
+            Properties.Settings.Default.SettingsWindowLeft = Left;
+            Properties.Settings.Default.Save();
+        }
+
         public void SaveSettings()
         {
             Properties.Settings.Default.mpd_host = MpdHost.Text;
diff --git a/Views/Shuffle.xaml b/Views/Shuffle.xaml
index 365ef20..cc8d78d 100644
--- a/Views/Shuffle.xaml
+++ b/Views/Shuffle.xaml
@@ -42,13 +42,13 @@
         </DataTemplate>
     </Window.Resources>
 
-    <Grid>
+    <Grid Margin="0,5,0,0">
         <StackPanel>
             <StackPanel HorizontalAlignment="Left" Orientation="Vertical" Margin="5,0,5,5">
                 <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                     <GroupBox.Header>
                         <TextBlock>
-                            <emoji:EmojiInline Text="🔡"/>
+                            <Run Text="🔡"/>
                             <Run Text="{x:Static properties:Resources.Shuffle_Filter}"/>
                         </TextBlock>
                     </GroupBox.Header>
@@ -80,7 +80,7 @@
                     <GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="300">
                         <GroupBox.Header>
                             <TextBlock>
-                            <emoji:EmojiInline Text="➕"/>
+                            <Run Text="🧾"/>
                             <Run Text="{x:Static properties:Resources.Queue_Management}"/>
                             </TextBlock>
                         </GroupBox.Header>
@@ -107,7 +107,7 @@
                     <GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="260" Margin="0,0,5,0">
                         <GroupBox.Header>
                             <TextBlock>
-                                <emoji:EmojiInline Text="♾️"/>
+                                <Run Text="♾️"/>
                                 <Run Text="{x:Static properties:Resources.Shuffle_Continuous}"/>
                             </TextBlock>
                         </GroupBox.Header>
diff --git a/Views/Shuffle.xaml.cs b/Views/Shuffle.xaml.cs
index 871469d..b1e8706 100644
--- a/Views/Shuffle.xaml.cs
+++ b/Views/Shuffle.xaml.cs
@@ -432,5 +432,12 @@ namespace unison
             WindowInteropHelper helper = new(this);
             helper.EnsureHandle();
         }
+
+        private void Window_LocationChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.ShuffleWindowTop = Top;
+            Properties.Settings.Default.ShuffleWindowLeft = Left;
+            Properties.Settings.Default.Save();
+        }
     }
 }
\ No newline at end of file