Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify name of selected color to SelColor

Browse Source
This commit is contained in:
Flamefire committed 2014-10-23 00:39:57 +02:00
1 parent 714b28294f
commit 10c456cbff
42 files changed
+914 -914
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CButton.cs
+8 -8
View File
@@ -33,8 +33,8 @@ namespace VocaluxeLib.Menu
public SThemeColor Color;
public SThemeColor SelColor;
public SThemeText Text;
public SThemeText SText;
[XmlIgnore] public bool STextSpecified;
public SThemeText SelText;
[XmlIgnore] public bool SelTextSpecified;
public SReflection Reflection;
public SReflection SelReflection;
}
@@ -120,7 +120,7 @@ namespace VocaluxeLib.Menu
_Theme = theme;
Text = new CText(_Theme.Text, _PartyModeID, buttonText);
_SelText = _Theme.STextSpecified ? new CText(_Theme.SText, _PartyModeID, buttonText) : null;
_SelText = _Theme.SelTextSpecified ? new CText(_Theme.SelText, _PartyModeID, buttonText) : null;
Selected = false;
EditMode = false;
@@ -196,7 +196,7 @@ namespace VocaluxeLib.Menu
Text.Z = Rect.Z;
if (xmlReader.ItemExists(item + "/SText"))
{
_Theme.STextSpecified = true;
_Theme.SelTextSpecified = true;
_ThemeLoaded &= _SelText.LoadTheme(item, "SText", xmlReader, true);
_SelText.Z = Rect.Z;
}
@@ -237,7 +237,7 @@ namespace VocaluxeLib.Menu
_Theme.Color.Color = Color;
_Theme.SelColor.Color = SelColor;
_Theme.Text = Text.GetTheme();
_Theme.SText = _SelText.GetTheme();
_Theme.SelText = _SelText.GetTheme();
LoadSkin();
}
@@ -265,7 +265,7 @@ namespace VocaluxeLib.Menu
else
Text.DrawRelative(Rect.X, Rect.Y);
}
else if (!_Theme.STextSpecified)
else if (!_Theme.SelTextSpecified)
{
texture = SelTexture ?? CBase.Themes.GetSkinTexture(_Theme.SkinSelected, _PartyModeID);
@@ -310,9 +310,9 @@ namespace VocaluxeLib.Menu
Text = new CText(_Theme.Text, _PartyModeID);
Text.LoadSkin();
if (_Theme.STextSpecified)
if (_Theme.SelTextSpecified)
{
_SelText = new CText(_Theme.SText, _PartyModeID);
_SelText = new CText(_Theme.SelText, _PartyModeID);
_SelText.LoadSkin();
}