diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index e1b765fd..f788a6eb 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -1738,7 +1738,7 @@ -1 - + @@ -1749,7 +1749,7 @@ -1 - + @@ -1760,7 +1760,7 @@ -1 - + @@ -1771,7 +1771,7 @@ -1 - + @@ -1782,7 +1782,7 @@ -1 - + @@ -1793,7 +1793,7 @@ -1 - + diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml index 7a99e1c6..55522dc7 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Ambient/Skin Blue.xml @@ -164,12 +164,12 @@ 1,000 0,000 - + 0,000 0,000 1,000 1,000 - + 0,000 0,000 diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml index ec8aa186..e84216aa 100644 --- a/Output/Themes/Ambient/Skin Green.xml +++ b/Output/Themes/Ambient/Skin Green.xml @@ -158,12 +158,12 @@ 1,000 0,000 - + 0,000 1,000 0,000 1,000 - + 0,000 0,000 diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml index f7218e1c..a020df4f 100644 --- a/Output/Themes/Ambient/Skin Red.xml +++ b/Output/Themes/Ambient/Skin Red.xml @@ -158,12 +158,12 @@ 1,000 0,000 - + 1,000 0,000 0,000 1,000 - + 0,000 0,000 diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml index 481605f6..46484874 100644 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ b/Output/Themes/Ambient/Skin Yellow.xml @@ -158,12 +158,12 @@ 1,000 0,000 - + 1,000 1,000 0,000 1,000 - + 0,000 0,000 diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 3fd1870c..703ec9cd 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -30,7 +30,7 @@ namespace VocaluxeLib.Menu public SRectF Rect; public SThemeColor Color; - public SThemeColor SelColor; + public SThemeColor ProcessedColor; } public class CLyric : CMenuElementBase, IMenuElement, IThemeable @@ -130,8 +130,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A); } - if (xmlReader.GetValue(item + "/SColor", out _Theme.SelColor.Name, String.Empty)) - _ThemeLoaded &= _Theme.SelColor.Get(_PartyModeID, out _ColorProcessed); + if (xmlReader.GetValue(item + "/SColor", out _Theme.ProcessedColor.Name, String.Empty)) + _ThemeLoaded &= _Theme.ProcessedColor.Get(_PartyModeID, out _ColorProcessed); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref _ColorProcessed.R); @@ -144,7 +144,7 @@ namespace VocaluxeLib.Menu { _Theme.Name = elementName; _Theme.Color.Color = _Color; - _Theme.SelColor.Color = _ColorProcessed; + _Theme.ProcessedColor.Color = _ColorProcessed; LoadSkin(); } return _ThemeLoaded; @@ -429,7 +429,7 @@ namespace VocaluxeLib.Menu public void LoadSkin() { _Theme.Color.Get(_PartyModeID, out _Color); - _Theme.SelColor.Get(_PartyModeID, out _ColorProcessed); + _Theme.ProcessedColor.Get(_PartyModeID, out _ColorProcessed); MaxRect = _Theme.Rect; _Text = new CText(X, Y, Z, H, W, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty);