Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into tic-tac-toe
This commit is contained in:
commit
c57da72d23
2 files changed
+8
-6
No files matched your search
@@ -84,6 +84,7 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
base.Init();
|
base.Init();
|
||||||
|
|
||||||
|
ButtonsJoker.Clear();
|
||||||
for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
|
for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
|
||||||
{
|
{
|
||||||
ButtonsJoker.Add("ButtonJoker" + (i + 1));
|
ButtonsJoker.Add("ButtonJoker" + (i + 1));
|
||||||
@@ -103,6 +104,7 @@ namespace Vocaluxe.Screens
|
|||||||
blist.Add(ButtonOptionsRandomMedley);
|
blist.Add(ButtonOptionsRandomMedley);
|
||||||
blist.Add(ButtonOptionsStartMedley);
|
blist.Add(ButtonOptionsStartMedley);
|
||||||
|
|
||||||
|
TextsPlayer.Clear();
|
||||||
for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
|
for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
|
||||||
{
|
{
|
||||||
TextsPlayer.Add("TextPlayer" + (i + 1));
|
TextsPlayer.Add("TextPlayer" + (i + 1));
|
||||||
@@ -203,7 +205,7 @@ namespace Vocaluxe.Screens
|
|||||||
switch (KeyEvent.Key)
|
switch (KeyEvent.Key)
|
||||||
{
|
{
|
||||||
case Keys.Escape:
|
case Keys.Escape:
|
||||||
if ((CSongs.Category < 0 || !(_sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)) && !_sso.Selection.PartyMode)
|
if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive)
|
||||||
CGraphics.FadeTo(EScreens.ScreenMain);
|
CGraphics.FadeTo(EScreens.ScreenMain);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -251,7 +253,7 @@ namespace Vocaluxe.Screens
|
|||||||
ApplyNewSearchFilter(_SearchText.Remove(_SearchText.Length - 1));
|
ApplyNewSearchFilter(_SearchText.Remove(_SearchText.Length - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_SearchActive && (CSongs.Category < 0) && !_sso.Selection.PartyMode)
|
if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive)
|
||||||
{
|
{
|
||||||
CGraphics.FadeTo(EScreens.ScreenMain);
|
CGraphics.FadeTo(EScreens.ScreenMain);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -545,7 +545,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public void AddValue(string value)
|
public void AddValue(string value)
|
||||||
{
|
{
|
||||||
AddValue(value, new STexture(-1));
|
AddValue(value, new STexture(-1), _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddValue(string value, int PartyModeID)
|
public void AddValue(string value, int PartyModeID)
|
||||||
@@ -555,12 +555,12 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public void AddValue(string value, STexture texture)
|
public void AddValue(string value, STexture texture)
|
||||||
{
|
{
|
||||||
AddValue(value, texture, _ValueIndexes.Count);
|
AddValue(value, texture, _ValueIndexes.Count, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddValue(string value, STexture texture, int valueIndex)
|
public void AddValue(string value, STexture texture, int valueIndex)
|
||||||
{
|
{
|
||||||
AddValue(value, texture, valueIndex, -1);
|
AddValue(value, texture, valueIndex, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddValue(string value, STexture texture, int valueIndex, int PartyModeID)
|
public void AddValue(string value, STexture texture, int valueIndex, int PartyModeID)
|
||||||
@@ -580,7 +580,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
foreach (string value in values)
|
foreach (string value in values)
|
||||||
{
|
{
|
||||||
AddValue(value, new STexture(-1));
|
AddValue(value, new STexture(-1), _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
_ValueBounds.Clear();
|
_ValueBounds.Clear();
|
||||||
|
|||||||
Reference in new issue
Block a user