Merge branch 'develop' of github.com:Flamefire/Vocaluxe into theme
This commit is contained in:
commit
a55d724620
21 files changed
+192
-111
No files matched your search
@@ -96,7 +96,18 @@ namespace VocaluxeLib.Menu
|
||||
}
|
||||
}
|
||||
public bool Visible = true;
|
||||
public bool Enabled = true;
|
||||
private bool _Enabled = true;
|
||||
|
||||
public bool Enabled
|
||||
{
|
||||
get { return _Enabled; }
|
||||
set
|
||||
{
|
||||
_Enabled = value;
|
||||
if (!_Enabled)
|
||||
_Selected = false;
|
||||
}
|
||||
}
|
||||
|
||||
public string GetThemeName()
|
||||
{
|
||||
@@ -138,7 +149,7 @@ namespace VocaluxeLib.Menu
|
||||
_SelText = new CText(button._SelText);
|
||||
Selected = false;
|
||||
EditMode = false;
|
||||
Enabled = button.Enabled;
|
||||
_Enabled = button._Enabled;
|
||||
|
||||
_Reflection = button._Reflection;
|
||||
_ReflectionHeight = button._ReflectionHeight;
|
||||
@@ -318,7 +329,7 @@ namespace VocaluxeLib.Menu
|
||||
|
||||
CTexture texture;
|
||||
|
||||
if (!Selected && !Pressed || !Enabled)
|
||||
if (!Selected && !Pressed || !_Enabled)
|
||||
{
|
||||
texture = Texture ?? CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
|
||||
|
||||
|
||||
Reference in new issue
Block a user