Fix ComplexFeature key background color

Author: Invvard

src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs

@@ -77,6 +77,7 @@ private KeyDisplayMode SelectKeyDisplayMode(ErgodoxKey ergodoxKey)
             .ToList();
 
             var featureCount = features.Count;
+            var isComplexFeature = featureCount == 1 && (ergodoxKey.DoubleTap != null || ergodoxKey.TapHold != null);
             KeyDefinition firstKeyDefinition = null;
             if (features.Any())
             {
@@ -87,8 +88,9 @@ private KeyDisplayMode SelectKeyDisplayMode(ErgodoxKey ergodoxKey)
             {
                 0 => KeyDisplayMode.Empty,
                 1 when ergodoxKey.Tap?.Macro != null => KeyDisplayMode.Macro,
-                1 when firstKeyDefinition.Category == KeyCategory.Modifier => KeyDisplayMode.Modifier,
                 1 when firstKeyDefinition.Category == KeyCategory.Shine => KeyDisplayMode.ColorControl,
+                1 when isComplexFeature => KeyDisplayMode.ComplexFeature,
+                1 when firstKeyDefinition.Category == KeyCategory.Modifier => KeyDisplayMode.Modifier,
                 1 when !string.IsNullOrWhiteSpace(ergodoxKey.CustomLabel) => KeyDisplayMode.CustomLabel,
                 >= 2 => KeyDisplayMode.DualFunction,
                 _ => KeyDisplayMode.Base
@@ -122,6 +124,7 @@ private Key PrepareKeyContent(ErgodoxKey ergodoxKey, KeyDisplayMode displayMode)
                     key.Primary = new BaseContent { Label = "Macro" };
                     break;
                 case KeyDisplayMode.Base:
+                case KeyDisplayMode.ComplexFeature:
                 case KeyDisplayMode.Modifier:
                 case KeyDisplayMode.ColorControl:
                     key.Primary = GetDisplayedFeature(features[0]);

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Enum/KeyDisplayMode.cs

@@ -8,6 +8,7 @@ public enum KeyDisplayMode
         Macro,
         CustomLabel,
         Modifier,
-        ColorControl
+        ColorControl,
+        ComplexFeature
     }
 }

src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml

@@ -18,6 +18,7 @@
     <converter:KeyCategoryToBrushConverter x:Key="KeyCategoryToBrushConverter"
                                            DefaultBackgroundBrush="{StaticResource DefaultBackgroundBrush}"
                                            ColorControlBackgroundBrush="{StaticResource ColorControlBackgroundBrush}"
+                                           ComplexFeatureBackgroundBrush="{StaticResource DualFunctionBackgroundBrush}"
                                            CustomLabelBackgroundBrush="{StaticResource CustomLabelBackgroundBrush}"
                                            DualFunctionBackgroundBrush="{StaticResource DualFunctionBackgroundBrush}"
                                            MacroBackgroundBrush="{StaticResource MacroBackgroundBrush}"

src/InvvardDev.EZLayoutDisplay.Desktop/View/Converter/KeyCategoryToBrushConverter.cs

@@ -12,6 +12,7 @@ public class KeyCategoryToBrushConverter : IValueConverter
     {
         public SolidColorBrush DefaultBackgroundBrush { private get; set; }
         public SolidColorBrush ColorControlBackgroundBrush { private get; set; }
+        public SolidColorBrush ComplexFeatureBackgroundBrush { private get; set; }
         public SolidColorBrush CustomLabelBackgroundBrush { private get; set; }
         public SolidColorBrush DualFunctionBackgroundBrush { private get; set; }
         public SolidColorBrush MacroBackgroundBrush { private get; set; }
@@ -21,6 +22,7 @@ public KeyCategoryToBrushConverter()
         {
             DefaultBackgroundBrush = Application.Current.Resources["DefaultBackgroundBrush"] as SolidColorBrush;
             ColorControlBackgroundBrush = Application.Current.Resources["ColorControlBackgroundBrush"] as SolidColorBrush;
+            ComplexFeatureBackgroundBrush = Application.Current.Resources["ComplexFeatureBackgroundBrush"] as SolidColorBrush;
             CustomLabelBackgroundBrush = Application.Current.Resources["CustomLabelBackgroundBrush"] as SolidColorBrush;
             DualFunctionBackgroundBrush = Application.Current.Resources["DualFunctionBackgroundBrush"] as SolidColorBrush;
             MacroBackgroundBrush = Application.Current.Resources["MacroBackgroundBrush"] as SolidColorBrush;
@@ -35,6 +37,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 brush = displayMode switch
                 {
                     KeyDisplayMode.ColorControl => ColorControlBackgroundBrush,
+                    KeyDisplayMode.ComplexFeature => ComplexFeatureBackgroundBrush,
                     KeyDisplayMode.CustomLabel => CustomLabelBackgroundBrush,
                     KeyDisplayMode.DualFunction => DualFunctionBackgroundBrush,
                     KeyDisplayMode.Macro => MacroBackgroundBrush,