From 8a70406c5c123101e1f3e57dcb36f7dacd43f091 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 26 Mar 2019 21:14:38 -0400
Subject: [PATCH 1/4] Display key font color

---
 .../Skins/KeyboardLayoutSkin.xaml                                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
index 2f206e28..5b2ff9fd 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
@@ -76,6 +76,7 @@
                 <Setter Property="Foreground" Value="#777" />
                 <Setter Property="FontSize" Value="22" />
                 <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Foreground" Value="{Binding EZKey.Color}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>

From ee13a17b59d4536903b7e2043c5a7534c3bba0f0 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 26 Mar 2019 21:40:37 -0400
Subject: [PATCH 2/4] Add the default font color

---
 .../Helper/EZLayoutMaker.cs                           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
index 42f0fa9f..bd68e587 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
@@ -51,7 +51,7 @@ private EZLayer PrepareEZLayer(ErgodoxLayer ergodoxLayer)
             var layer = new EZLayer {
                                         Index = ergodoxLayer.Position,
                                         Name = ergodoxLayer.Title,
-                                        Color = ergodoxLayer.Color
+                                        Color = GetColor(ergodoxLayer.Color)
                                     };
 
             foreach (var ergodoxKey in ergodoxLayer.Keys)
@@ -91,7 +91,7 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
             EZKey key = new EZKey {
                                       KeyCategory = keyDefinition.KeyCategory,
                                       Label = new KeyLabel(keyDefinition.Label, keyDefinition.IsGlyph),
-                                      Color = ergodoxKey.GlowColor,
+                                      Color = GetColor(ergodoxKey.GlowColor),
                                       DisplayType = KeyDisplayType.SimpleLabel
                                   };
 
@@ -167,6 +167,13 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
             return key;
         }
 
+        private static string GetColor(string keyColor)
+        {
+            var fontColor = string.IsNullOrWhiteSpace(keyColor) ? "#777777" : keyColor;
+
+            return fontColor;
+        }
+
         private KeyDefinition GetKeyDefinition(string ergodoxKeyCode)
         {
             var keyDefinition = _keyDefinitionDictionary.KeyDefinitions.FirstOrDefault(k => k.KeyCode == ergodoxKeyCode);

From 7407a9fcb8908c73dc2c584c4f1da1d90b89e30d Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 26 Mar 2019 21:43:26 -0400
Subject: [PATCH 3/4] Use the previous color code

---
 src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
index bd68e587..29ea9884 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
@@ -169,7 +169,7 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
 
         private static string GetColor(string keyColor)
         {
-            var fontColor = string.IsNullOrWhiteSpace(keyColor) ? "#777777" : keyColor;
+            var fontColor = string.IsNullOrWhiteSpace(keyColor) ? "#777" : keyColor;
 
             return fontColor;
         }

From 0a1a285cb495ceb4263563c31d883e7e5faf6e09 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 26 Mar 2019 21:43:52 -0400
Subject: [PATCH 4/4] Remove the default foreground color

---
 .../Skins/KeyboardLayoutSkin.xaml                              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
index 5b2ff9fd..ad716169 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
@@ -68,12 +68,11 @@
         <Style.Triggers>
             <DataTrigger Binding="{Binding EZKey.Label.IsGlyph}" Value="true">
                 <Setter Property="FontFamily" Value="{StaticResource OryxFontFamily}" />
-                <Setter Property="Foreground" Value="#777" />
                 <Setter Property="FontSize" Value="18" />
+                <Setter Property="Foreground" Value="{Binding EZKey.Color}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding EZKey.Label.IsGlyph}" Value="false">
                 <Setter Property="FontFamily" Value="{StaticResource LatoFontFamily}" />
-                <Setter Property="Foreground" Value="#777" />
                 <Setter Property="FontSize" Value="22" />
                 <Setter Property="FontWeight" Value="Bold" />
                 <Setter Property="Foreground" Value="{Binding EZKey.Color}" />