fixed song navigation in party mode
This commit is contained in:
1 parent
0d8934dea8
commit
7202cf5616
5 files changed
+28
-10
No files matched your search
@@ -654,7 +654,7 @@ namespace Vocaluxe.Screens
|
||||
if (_sso.Selection.PartyMode)
|
||||
ToggleSongOptions(ESongOptionsView.None);
|
||||
|
||||
SongMenus[htSongMenus(SongMenu)].Update();
|
||||
SongMenus[htSongMenus(SongMenu)].Update(_sso);
|
||||
|
||||
if (SongMenus[htSongMenus(SongMenu)].IsSmallView())
|
||||
CheckPlaylist();
|
||||
@@ -697,7 +697,10 @@ namespace Vocaluxe.Screens
|
||||
if (_sso.Selection.RandomOnly && _sso.Selection.NumJokers != null)
|
||||
{
|
||||
Buttons[htButtons(ButtonStart)].Visible = true;
|
||||
SongMenus[htSongMenus(SongMenu)].SetSmallView(true);
|
||||
|
||||
if(!SongMenus[htSongMenus(SongMenu)].IsSmallView())
|
||||
SongMenus[htSongMenus(SongMenu)].SetSmallView(true);
|
||||
|
||||
for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
|
||||
{
|
||||
if (i < _sso.Selection.NumJokers.Length)
|
||||
@@ -1073,7 +1076,7 @@ namespace Vocaluxe.Screens
|
||||
Buttons[htButtons(ButtonOptionsSingAll)].Visible = false;
|
||||
Buttons[htButtons(ButtonOptionsSingAllVisible)].Visible = false;
|
||||
Buttons[htButtons(ButtonOptionsOpenPlaylist)].Visible = false;
|
||||
Buttons[htButtons(ButtonOpenOptions)].Visible = true;
|
||||
Buttons[htButtons(ButtonOpenOptions)].Visible = false;
|
||||
Texts[htTexts(TextOptionsTitle)].Visible = false;
|
||||
Statics[htStatics(StaticOptionsBG)].Visible = false;
|
||||
}
|
||||
@@ -1082,7 +1085,7 @@ namespace Vocaluxe.Screens
|
||||
#region Playlist Actions
|
||||
public void CheckPlaylist()
|
||||
{
|
||||
if (Playlists[htPlaylists(Playlist)].ActivePlaylistID == -1)
|
||||
if (Playlists[htPlaylists(Playlist)].ActivePlaylistID == -1 && _PlaylistActive)
|
||||
ClosePlaylist();
|
||||
}
|
||||
|
||||
|
||||
@@ -48,9 +48,9 @@ namespace Vocaluxe.Menu.SongMenu
|
||||
}
|
||||
|
||||
#region ISongMenu
|
||||
public void Update()
|
||||
public void Update(ScreenSongOptions SongOptions)
|
||||
{
|
||||
_SongMenu.Update();
|
||||
_SongMenu.Update(SongOptions);
|
||||
}
|
||||
|
||||
public void OnShow()
|
||||
|
||||
@@ -434,7 +434,7 @@ namespace Vocaluxe.Menu.SongMenu
|
||||
Init();
|
||||
}
|
||||
|
||||
public virtual void Update()
|
||||
public virtual void Update(ScreenSongOptions SongOptions)
|
||||
{
|
||||
if (!_Initialized)
|
||||
return;
|
||||
|
||||
@@ -100,6 +100,21 @@ namespace Vocaluxe.Menu.SongMenu
|
||||
_Title = _Theme.songMenuTileBoard.TextTitle;
|
||||
_SongLength = _Theme.songMenuTileBoard.TextSongLength;
|
||||
}
|
||||
|
||||
public override void Update(ScreenSongOptions SongOptions)
|
||||
{
|
||||
base.Update(SongOptions);
|
||||
|
||||
if (SongOptions.Selection.RandomOnly)
|
||||
{
|
||||
_Locked = _PreviewSelected;
|
||||
_actualSelection = _PreviewSelected;
|
||||
for (int i = 0; i < _Tiles.Count; i++)
|
||||
{
|
||||
_Tiles[i].Selected = _Locked == i + _Offset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnShow()
|
||||
{
|
||||
@@ -170,9 +185,9 @@ namespace Vocaluxe.Menu.SongMenu
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((_Locked == -1 || !sel) &&
|
||||
KeyEvent.Key != Keys.Escape && KeyEvent.Key != Keys.Back && KeyEvent.Key != Keys.PageUp && KeyEvent.Key != Keys.PageDown)
|
||||
(KeyEvent.Key != Keys.Escape && KeyEvent.Key != Keys.Back && KeyEvent.Key != Keys.PageUp && KeyEvent.Key != Keys.PageDown))
|
||||
{
|
||||
if (_PreviewSelected > -1)
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace Vocaluxe.Menu.SongMenu
|
||||
{
|
||||
interface ISongMenu : IMenuElement
|
||||
{
|
||||
void Update();
|
||||
void Update(ScreenSongOptions SongOptions);
|
||||
void OnShow();
|
||||
void OnHide();
|
||||
|
||||
|
||||
Reference in new issue
Block a user