diff --git a/Vocaluxe/Menu/CMenu.cs b/Vocaluxe/Menu/CMenu.cs index eb870b8c..2e11171d 100644 --- a/Vocaluxe/Menu/CMenu.cs +++ b/Vocaluxe/Menu/CMenu.cs @@ -997,7 +997,8 @@ namespace Vocaluxe.Menu _Interactions[i].Type == EType.TSelectSlide || _Interactions[i].Type == EType.TStatic || _Interactions[i].Type == EType.TNameSelection || - _Interactions[i].Type == EType.TText)) + _Interactions[i].Type == EType.TText || + _Interactions[i].Type == EType.TSongMenu)) { ZSort zs = new ZSort(); zs.ID = i; diff --git a/Vocaluxe/Menu/SongMenu/CSongMenu.cs b/Vocaluxe/Menu/SongMenu/CSongMenu.cs index 24dd94d1..b37e1e04 100644 --- a/Vocaluxe/Menu/SongMenu/CSongMenu.cs +++ b/Vocaluxe/Menu/SongMenu/CSongMenu.cs @@ -33,8 +33,8 @@ namespace Vocaluxe.Menu.SongMenu public bool Visible { - get { return _SongMenu.IsSelected(); } - set { _SongMenu.SetSelected(value); } + get { return _SongMenu.IsVisible(); } + set { _SongMenu.SetVisible(value); } } public SRectF Rect diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs b/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs index 7c5c069e..ac6bf659 100644 --- a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs +++ b/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs @@ -177,7 +177,7 @@ namespace Vocaluxe.Menu.SongMenu public SRectF GetRect() { - return Rect; + return _Rect; } public SColorF Color diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 92a4ee3f..7617a044 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -222,7 +222,6 @@ namespace Vocaluxe.Screens public override bool Draw() { base.Draw(); - SongMenus[htSongMenus(SongMenu)].Draw(); return true; }