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

Fix showing/hiding of song menu

Browse Source
This commit is contained in:
Flamefire committed 2014-08-07 20:07:13 +02:00
1 parent e1329b4a93
commit a8f23cb3bf
1 file changed
+13 -9
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSong.cs
+13 -9
View File
@@ -79,7 +79,7 @@ namespace Vocaluxe.Screens
private readonly List<string> _ButtonsJoker = new List<string>(); private readonly List<string> _ButtonsJoker = new List<string>();
private readonly List<string> _TextsPlayer = new List<string>(); private readonly List<string> _TextsPlayer = new List<string>();
private bool _SongOptionsActive; private ESongOptionsView _CurSongOptionsView;
private bool _PlaylistActive; private bool _PlaylistActive;
private readonly List<EGameMode> _AvailableGameModes; private readonly List<EGameMode> _AvailableGameModes;
private SScreenSongOptions _Sso; private SScreenSongOptions _Sso;
@@ -167,7 +167,7 @@ namespace Vocaluxe.Screens
return true; return true;
} }
if (!_SongOptionsActive) if (_CurSongOptionsView == ESongOptionsView.None)
{ {
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode) && keyEvent.Mod != EModifier.Ctrl) if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode) && keyEvent.Mod != EModifier.Ctrl)
{ {
@@ -430,7 +430,7 @@ namespace Vocaluxe.Screens
if (mouseEvent.RB) if (mouseEvent.RB)
{ {
if (_SongOptionsActive) if (_CurSongOptionsView != ESongOptionsView.None)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
return true; return true;
@@ -468,7 +468,11 @@ namespace Vocaluxe.Screens
mouseEvent.Handled = true; mouseEvent.Handled = true;
if (mouseEvent.Handled) if (mouseEvent.Handled)
{
if (_CurSongOptionsView != ESongOptionsView.None)
_ToggleSongOptions(ESongOptionsView.None);
return true; return true;
}
if (mouseEvent.LB) if (mouseEvent.LB)
{ {
@@ -572,9 +576,9 @@ namespace Vocaluxe.Screens
} }
} }
if (CSongs.NumSongsVisible > 0 && _SongMenu.GetPreviewSongNr() != -1 && !_Sso.Selection.PartyMode) if (_SongMenu.GetPreviewSongNr() != -1 && !_Sso.Selection.PartyMode && _SongMenu.IsMouseOverSelectedSong(mouseEvent))
{ {
_ToggleSongOptions(!_SongOptionsActive ? ESongOptionsView.Song : ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.Song);
return true; return true;
} }
} }
@@ -1147,13 +1151,13 @@ namespace Vocaluxe.Screens
_Buttons[_ButtonOpenOptions].Visible = true; _Buttons[_ButtonOpenOptions].Visible = true;
if (view == ESongOptionsView.None) if (view == ESongOptionsView.None)
_SongOptionsActive = false; _CurSongOptionsView = view;
else if (CSongs.IsInCategory) else if (CSongs.IsInCategory)
_SongOptionsActive = CSongs.VisibleSongs.Count > 0; _CurSongOptionsView = CSongs.VisibleSongs.Count > 0 ? view : ESongOptionsView.None;
else else
_SongOptionsActive = CSongs.Categories.Count > 0; _CurSongOptionsView = CSongs.Categories.Count > 0 ? view : ESongOptionsView.None;
if (!_SongOptionsActive) if (_CurSongOptionsView == ESongOptionsView.None)
return; return;
//Has to be done here otherwhise changed playlist names will not appear until OnShow is called! //Has to be done here otherwhise changed playlist names will not appear until OnShow is called!