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

Feature/add glowing colors #46

Merged
Invvard merged 4 commits into from
Mar 27, 2019
Merged

Feature/add glowing colors #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a70406
Display key font color
Invvard Mar 27, 2019
ee13a17
Add the default font color
Invvard Mar 27, 2019
7407a9f
Use the previous color code
Invvard Mar 27, 2019
0a1a285
Remove the default foreground color
Invvard Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
};

Expand Down Expand Up @@ -167,6 +167,13 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
return key;
}

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

return fontColor;
}

private KeyDefinition GetKeyDefinition(string ergodoxKeyCode)
{
var keyDefinition = _keyDefinitionDictionary.KeyDefinitions.FirstOrDefault(k => k.KeyCode == ergodoxKeyCode);
Expand Down
4 changes: 2 additions & 2 deletions src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
<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}" />
</DataTrigger>
</Style.Triggers>
</Style>
Expand Down