From 232896c95e0d771d68e5cf0e34bb54f56afaad47 Mon Sep 17 00:00:00 2001
From: lars-berger <lars.berger@yahoo.com>
Date: Sun, 17 Sep 2023 03:47:16 +0800
Subject: [PATCH] fix: embedded icon font not displaying correctly (#398)

---
 GlazeWM.App/GlazeWM.App.csproj                |  1 +
 .../UserConfigs/NetworkComponentConfig.cs     | 19 +++++++------------
 .../UserConfigs/SystemTrayComponentConfig.cs  | 12 ++----------
 .../UserConfigs/VolumeComponentConfig.cs      |  8 ++++----
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/GlazeWM.App/GlazeWM.App.csproj b/GlazeWM.App/GlazeWM.App.csproj
index 20c07bb20..219e5996a 100644
--- a/GlazeWM.App/GlazeWM.App.csproj
+++ b/GlazeWM.App/GlazeWM.App.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7-windows10.0.17763.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <DebugType>embedded</DebugType>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
     <AssemblyName>GlazeWM</AssemblyName>
diff --git a/GlazeWM.Domain/UserConfigs/NetworkComponentConfig.cs b/GlazeWM.Domain/UserConfigs/NetworkComponentConfig.cs
index e25014ce5..cc04eb280 100644
--- a/GlazeWM.Domain/UserConfigs/NetworkComponentConfig.cs
+++ b/GlazeWM.Domain/UserConfigs/NetworkComponentConfig.cs
@@ -5,35 +5,30 @@ public class NetworkComponentConfig : BarComponentConfig
     /// <summary>
     /// Label for wifi at 0% RSSI.
     /// </summary>
-    public string LabelWifiStrength0 { get; set; } = "  ";
+    public string LabelWifiStrength0 { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
     /// <summary>
     /// Label for wifi at 25% RSSI.
     /// </summary>
-    public string LabelWifiStrength25 { get; set; } = "  ";
+    public string LabelWifiStrength25 { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
     /// <summary>
     /// Label for wifi at 50% RSSI.
     /// </summary>
-    public string LabelWifiStrength50 { get; set; } = "  ";
+    public string LabelWifiStrength50 { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
     /// <summary>
     /// Label for wifi at 75% RSSI.
     /// </summary>
-    public string LabelWifiStrength75 { get; set; } = "  ";
+    public string LabelWifiStrength75 { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
     /// <summary>
     /// Label for wifi at 100% RSSI.
     /// </summary>
-    public string LabelWifiStrength100 { get; set; } = "  ";
+    public string LabelWifiStrength100 { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
     /// <summary>
     /// Label for ethernet connection.
     /// </summary>
-    public string LabelEthernet { get; set; } = "  ";
+    public string LabelEthernet { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
     /// <summary>
     /// Label for connection to the internet.
     /// </summary>
-    public string LabelNoInternet { get; set; } = "  ";
-
-    public NetworkComponentConfig()
-    {
-      FontFamily = "GlazeWM.App.Resources#Material Icons";
-    }
+    public string LabelNoInternet { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
   }
 }
diff --git a/GlazeWM.Domain/UserConfigs/SystemTrayComponentConfig.cs b/GlazeWM.Domain/UserConfigs/SystemTrayComponentConfig.cs
index 2dd1ab303..7d8a8e00c 100644
--- a/GlazeWM.Domain/UserConfigs/SystemTrayComponentConfig.cs
+++ b/GlazeWM.Domain/UserConfigs/SystemTrayComponentConfig.cs
@@ -5,19 +5,11 @@ public class SystemTrayComponentConfig : BarComponentConfig
     /// <summary>
     /// Expands to show both pinned and unppined icons.
     /// </summary>
-    public string LabelExpandText { get; set; } = "";
+    public string LabelExpandText { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
 
     /// <summary>
     /// Collapse to show only pinned icons.
     /// </summary>
-    public string LabelCollapseText { get; set; } = "";
-
-    /// <summary>
-    /// Sets default icon font if one isn't specified.
-    /// </summary>
-    public SystemTrayComponentConfig()
-    {
-      FontFamily = "GlazeWM.App.Resources#Material Icons";
-    }
+    public string LabelCollapseText { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>";
   }
 }
diff --git a/GlazeWM.Domain/UserConfigs/VolumeComponentConfig.cs b/GlazeWM.Domain/UserConfigs/VolumeComponentConfig.cs
index 8cb403845..744df85c2 100644
--- a/GlazeWM.Domain/UserConfigs/VolumeComponentConfig.cs
+++ b/GlazeWM.Domain/UserConfigs/VolumeComponentConfig.cs
@@ -9,19 +9,19 @@ public class VolumeComponentConfig : BarComponentConfig
     /// <summary>
     /// Label for low volume.
     /// </summary>
-    public string LabelLow { get; set; } = "<attr ff='GlazeWM.App.Resources#Material Icons'></attr>{volume_level}%";
+    public string LabelLow { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>{volume_level}%";
     /// <summary>
     /// Label for medium volume.
     /// </summary>
-    public string LabelMedium { get; set; } = "<attr ff='GlazeWM.App.Resources#Material Icons'></attr>{volume_level}%";
+    public string LabelMedium { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>{volume_level}%";
     /// <summary>
     /// Label for high volume.
     /// </summary>
-    public string LabelHigh { get; set; } = "<attr ff='GlazeWM.App.Resources#Material Icons'></attr>{volume_level}%";
+    public string LabelHigh { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>{volume_level}%";
     /// <summary>
     /// Label for volume mute.
     /// </summary>
-    public string LabelMute { get; set; } = "<attr ff='GlazeWM.App.Resources#Material Icons'></attr>{volume_level}%";
+    public string LabelMute { get; set; } = "<attr ff='pack://application:,,,/Resources/#Material Icons'></attr>{volume_level}%";
   }
 
 }