fixed ESC and BACK key handling in song screen (leaving screen)
This commit is contained in:
1 parent
68c9ad83d8
commit
b46371428f
1 file changed
+4
-2
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user