Unify name of selected color to SelColor
This commit is contained in:
1 parent
714b28294f
commit
10c456cbff
42 files changed
+914
-914
No files matched your search
@@ -30,7 +30,7 @@ namespace VocaluxeLib.Menu
|
||||
public SRectF Rect;
|
||||
|
||||
public SThemeColor Color;
|
||||
public SThemeColor SColor;
|
||||
public SThemeColor SelColor;
|
||||
}
|
||||
|
||||
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.SColor.Name, String.Empty))
|
||||
_ThemeLoaded &= _Theme.SColor.Get(_PartyModeID, out _ColorProcessed);
|
||||
if (xmlReader.GetValue(item + "/SColor", out _Theme.SelColor.Name, String.Empty))
|
||||
_ThemeLoaded &= _Theme.SelColor.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.SColor.Color = _ColorProcessed;
|
||||
_Theme.SelColor.Color = _ColorProcessed;
|
||||
LoadSkin();
|
||||
}
|
||||
return _ThemeLoaded;
|
||||
@@ -429,7 +429,7 @@ namespace VocaluxeLib.Menu
|
||||
public void LoadSkin()
|
||||
{
|
||||
_Theme.Color.Get(_PartyModeID, out _Color);
|
||||
_Theme.SColor.Get(_PartyModeID, out _ColorProcessed);
|
||||
_Theme.SelColor.Get(_PartyModeID, out _ColorProcessed);
|
||||
|
||||
MaxRect = _Theme.Rect;
|
||||
_Text = new CText(X, Y, Z, H, W, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty);
|
||||
|
||||
Reference in new issue
Block a user