Skip to content
This repository has been archived by the owner on Nov 25, 2023. It is now read-only.

Commit

Permalink
Merge pull request #89 from Invvard/fix/85-color-not-displayed
Browse files Browse the repository at this point in the history
Fix/85 color not displayed
  • Loading branch information
Invvard authored Jun 14, 2019
2 parents b459da4 + 5ea67e4 commit a36ade0
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 106 deletions.
10 changes: 5 additions & 5 deletions src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private EZLayer PrepareEZLayer(ErgodoxLayer ergodoxLayer)

foreach (var ergodoxKey in ergodoxLayer.Keys)
{
EZKey key = PrepareKeyLabels(ergodoxKey);
EZKey key = PrepareKeyLabels(ergodoxKey, layer.Color);

layer.EZKeys.Add(key);
}
Expand All @@ -66,7 +66,7 @@ private EZLayer PrepareEZLayer(ErgodoxLayer ergodoxLayer)
return layer;
}

private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey, string layerColor)
{
Logger.TraceMethod();
Logger.DebugInputParam(nameof(ergodoxKey), ergodoxKey);
Expand All @@ -91,7 +91,7 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
EZKey key = new EZKey {
KeyCategory = keyDefinition.KeyCategory,
Label = new KeyLabel(keyDefinition.Label, keyDefinition.IsGlyph),
Color = GetColor(ergodoxKey.GlowColor),
Color = GetColor(ergodoxKey.GlowColor, layerColor),
DisplayType = KeyDisplayType.SimpleLabel
};

Expand Down Expand Up @@ -175,9 +175,9 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
return key;
}

private static string GetColor(string keyColor)
private static string GetColor(string keyColor, string defaultColor = "#777")
{
var fontColor = string.IsNullOrWhiteSpace(keyColor) ? "#777" : keyColor;
var fontColor = string.IsNullOrWhiteSpace(keyColor) ? defaultColor : keyColor;

return fontColor;
}
Expand Down
Loading

0 comments on commit a36ade0

Please sign in to comment.