Revert video-full-screen.

Vocaluxe/Menu/SongMenu/CSongMenu.cs

@@ -143,16 +143,6 @@ namespace Vocaluxe.Menu.SongMenu
             _SongMenu.SetSmallView(SmallView);
         }
 
-        public void ToggleVideoFull()
-        {
-            _SongMenu.ToggleVideoFull();
-        }
-
-        public bool IsVideoFull()
-        {
-            return _SongMenu.IsVideoFull();
-        }
-
         #endregion ISongMenu
 
         #region IMenuElement

Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs

@@ -484,9 +484,6 @@ namespace Vocaluxe.Menu.SongMenu
             _timer.Stop();
             _timer.Reset();
             _SelectedInternal = _SelectedPending;
-
-            if (IsVideoFull())
-                ToggleVideoFull();
         }
 
         public virtual void HandleInput(ref KeyEvent KeyEvent)
@@ -556,17 +553,6 @@ namespace Vocaluxe.Menu.SongMenu
             return false;
         }
 
-        public virtual void ToggleVideoFull()
-        {
-            if (!_Initialized)
-                return;
-        }
-
-        public virtual bool IsVideoFull()
-        {
-            return false;
-        }
-
         public virtual void UnloadTextures()
         {
         }

Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -41,7 +41,6 @@ namespace Vocaluxe.Menu.SongMenu
         private int _actualSelection = -1;
 
         private bool _SmallView = false;
-        private bool _VidFull = false;
 
         public override int GetActualSelection()
         {
@@ -360,10 +359,6 @@ namespace Vocaluxe.Menu.SongMenu
             }
             else if (_PreviewSelected != -1 && MouseEvent.LB && CSongs.Category != -1)
             {
-                if (CHelper.IsInBounds(_VideoIcon.Rect, MouseEvent))
-                {
-                    ToggleVideoFull();
-                }
                 if (CHelper.IsInBounds(_CoverBig.Rect, MouseEvent) || CHelper.IsInBounds(_TextBG.Rect, MouseEvent))
                 {
                     _Locked = _PreviewSelected;
@@ -380,10 +375,6 @@ namespace Vocaluxe.Menu.SongMenu
                     }
                 }
             }
-            else if (MouseEvent.LB && CHelper.IsInBounds(_VideoIcon.Rect, MouseEvent))
-            {
-                ToggleVideoFull();
-            }
 
             if (MouseEvent.Wheel > 0)
             {
@@ -481,26 +472,14 @@ namespace Vocaluxe.Menu.SongMenu
 
             if (_vidtex.index != -1 && _Video != -1)
             {
-                if (_VidFull)
+                RectangleF bounds = new RectangleF(_CoverBig.Rect.X, _CoverBig.Rect.Y, _CoverBig.Rect.W, _CoverBig.Rect.H);
-                {
+                RectangleF rect = new RectangleF(0f, 0f, _vidtex.width, _vidtex.height);
-                    RectangleF bounds = new RectangleF(0, 0, CSettings.iRenderW, CSettings.iRenderH);
+                CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
-                    RectangleF rect = new RectangleF(0f, 0f, _vidtex.width, _vidtex.height);
-                    CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
 
-                    CDraw.DrawTexture(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.zNear),
+                CDraw.DrawTexture(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
-                        _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
+                    _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
-                }
+                CDraw.DrawTextureReflection(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
-                else
+                    _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
-                {
-                    RectangleF bounds = new RectangleF(_CoverBig.Rect.X, _CoverBig.Rect.Y, _CoverBig.Rect.W, _CoverBig.Rect.H);
-                    RectangleF rect = new RectangleF(0f, 0f, _vidtex.width, _vidtex.height);
-                    CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
-
-                    CDraw.DrawTexture(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
-                        _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
-                    CDraw.DrawTextureReflection(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
-                        _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
-                }
             }
 
 
@@ -814,16 +793,6 @@ namespace Vocaluxe.Menu.SongMenu
             return _SmallView;
         }
 
-        public override void ToggleVideoFull()
-        {
-            _VidFull = !_VidFull;
-        }
-
-        public override bool IsVideoFull()
-        {
-            return _VidFull;
-        }
-
         public override void LoadTextures()
         {
             base.LoadTextures();

Vocaluxe/Menu/SongMenu/ISongMenu.cs

@@ -33,9 +33,6 @@ namespace Vocaluxe.Menu.SongMenu
         bool IsVisible();
         void SetVisible(bool Visible);
 
-        void ToggleVideoFull();
-        bool IsVideoFull();
-
         bool IsSmallView();
         void SetSmallView(bool SmallView);
 

Vocaluxe/Screens/CScreenSong.cs

@@ -147,9 +147,7 @@ namespace Vocaluxe.Screens
                     switch (KeyEvent.Key)
                     {
                         case Keys.Escape:
-                            if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
+                            if (CSongs.Category < 0 || CConfig.Tabs == EOffOn.TR_CONFIG_OFF)
-                                SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
-                            else if (CSongs.Category < 0 || CConfig.Tabs == EOffOn.TR_CONFIG_OFF)
                                 CGraphics.FadeTo(EScreens.ScreenMain);
                             break;
 
@@ -157,11 +155,7 @@ namespace Vocaluxe.Screens
                             if (CSongs.NumVisibleSongs > 0)
                             {
                                 if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
-                                {
                                     ToggleSongOptions(ESongOptionsView.Song);
-                                    if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
-                                        SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
-                                }
                             }
                             break;
 
@@ -186,8 +180,6 @@ namespace Vocaluxe.Screens
                             break;
 
                         case Keys.Space:
-                            if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
-                                SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
                             ToggleSongOptions(ESongOptionsView.General);
                             break;
 
@@ -201,8 +193,6 @@ namespace Vocaluxe.Screens
                             else
                             {
                                 _SearchActive = true;
-                                if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
-                                    SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
                             }
                             break;
 
@@ -231,8 +221,6 @@ namespace Vocaluxe.Screens
                                 else
                                 {
                                     _SearchActive = true;
-                                    if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
-                                        SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
                                 }
                             }
                             break;
@@ -261,7 +249,7 @@ namespace Vocaluxe.Screens
                 }
             }
 
-            else if(!SongMenus[htSongMenus(SongMenu)].IsVideoFull())
+            else
             {
                 switch (KeyEvent.Key)
                 {
@@ -315,134 +303,118 @@ namespace Vocaluxe.Screens
                 }
             }
 
-            if (KeyEvent.Key == Keys.V)
-            {
-                if (CSongs.Category != -1)
-                {
-                    SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
-                }
-            }
-
             return true;
         }
 
         public override bool HandleMouse(MouseEvent MouseEvent)
         {
-            if (!SongMenus[htSongMenus(SongMenu)].IsVideoFull())
+            base.HandleMouse(MouseEvent);
+
+            if (Playlists[htPlaylists(Playlist)].Visible && Playlists[htPlaylists(Playlist)].IsMouseOver(MouseEvent))
             {
-                base.HandleMouse(MouseEvent);
+                _PlaylistActive = true;
+                Playlists[htPlaylists(Playlist)].Selected = _PlaylistActive;
+                SongMenus[htSongMenus(SongMenu)].SetActive(!_PlaylistActive);
+            }
+            else if (CHelper.IsInBounds(SongMenus[htSongMenus(SongMenu)].Rect, MouseEvent.X, MouseEvent.Y))
+            {
+                _PlaylistActive = false;
+                Playlists[htPlaylists(Playlist)].Selected = _PlaylistActive;
+                SongMenus[htSongMenus(SongMenu)].SetActive(!_PlaylistActive);
+            }
 
-                if (Playlists[htPlaylists(Playlist)].Visible && Playlists[htPlaylists(Playlist)].IsMouseOver(MouseEvent))
+            if (Playlists[htPlaylists(Playlist)].Visible && Playlists[htPlaylists(Playlist)].HandleMouse(MouseEvent))
+                return true;
+
+            if (!_SongOptionsActive)
+            {
+
+                if ((MouseEvent.RB) && (CSongs.Category < 0))
                 {
-                    _PlaylistActive = true;
+                    CGraphics.FadeTo(EScreens.ScreenMain);
-                    Playlists[htPlaylists(Playlist)].Selected = _PlaylistActive;
-                    SongMenus[htSongMenus(SongMenu)].SetActive(!_PlaylistActive);
                 }
-                else if (CHelper.IsInBounds(SongMenus[htSongMenus(SongMenu)].Rect, MouseEvent.X, MouseEvent.Y))
+                else if (MouseEvent.RB && _SongOptionsActive)
+                    ToggleSongOptions(ESongOptionsView.None);
+
+                if (MouseEvent.MB && CSongs.Category != -1)
                 {
-                    _PlaylistActive = false;
+                    Console.WriteLine("MB pressed");
-                    Playlists[htPlaylists(Playlist)].Selected = _PlaylistActive;
+                    SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
-                    SongMenus[htSongMenus(SongMenu)].SetActive(!_PlaylistActive);
                 }
-
+                else if (MouseEvent.MB && CSongs.Category == -1)
-                if (Playlists[htPlaylists(Playlist)].Visible && Playlists[htPlaylists(Playlist)].HandleMouse(MouseEvent))
-                    return true;
-
-                if (!_SongOptionsActive)
                 {
-
+                    Console.WriteLine("MB pressed");
-                    if ((MouseEvent.RB) && (CSongs.Category < 0))
+                    SongMenus[htSongMenus(SongMenu)].SetSelectedCategory(CSongs.GetRandomCategory());
-                    {
-                        CGraphics.FadeTo(EScreens.ScreenMain);
-                    }
-                    else if (MouseEvent.RB && _SongOptionsActive)
-                        ToggleSongOptions(ESongOptionsView.None);
-
-                    if (MouseEvent.MB && CSongs.Category != -1)
-                    {
-                        Console.WriteLine("MB pressed");
-                        SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
-                    }
-                    else if (MouseEvent.MB && CSongs.Category == -1)
-                    {
-                        Console.WriteLine("MB pressed");
-                        SongMenus[htSongMenus(SongMenu)].SetSelectedCategory(CSongs.GetRandomCategory());
-                    }
-                    else
-                        SongMenus[htSongMenus(SongMenu)].HandleMouse(ref MouseEvent);
-
-                    if (MouseEvent.LB && CSongs.NumVisibleSongs > 0 && SongMenus[htSongMenus(SongMenu)].GetActualSelection() != -1)
-                    {
-                        if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
-                        {
-                            ToggleSongOptions(ESongOptionsView.Song);
-                        }
-                    }
-                    else if (MouseEvent.LB && IsMouseOver(MouseEvent))
-                    {
-                        if (Buttons[htButtons(ButtonOpenOptions)].Selected)
-                        {
-                            ToggleSongOptions(ESongOptionsView.General);
-                        }
-                    }
                 }
-
                 else
+                    SongMenus[htSongMenus(SongMenu)].HandleMouse(ref MouseEvent);
+
+                if (MouseEvent.LB && CSongs.NumVisibleSongs > 0 && SongMenus[htSongMenus(SongMenu)].GetActualSelection() != -1)
                 {
-                    if (MouseEvent.LB && IsMouseOver(MouseEvent))
+                    if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
                     {
-                        if (Buttons[htButtons(ButtonOptionsClose)].Selected)
+                        ToggleSongOptions(ESongOptionsView.Song);
-                        {
-                            ToggleSongOptions(ESongOptionsView.None);
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsSing)].Selected)
-                        {
-                            ToggleSongOptions(ESongOptionsView.None);
-                            StartSong(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
-                        {
-                            OpenAndAddPlaylistAction();
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsRandom)].Selected)
-                        {
-                            if (CSongs.Category != -1)
-                            {
-                                SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
-                            }
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsRandomCategory)].Selected)
-                        {
-                            if (CSongs.Category == -1)
-                            {
-                                SongMenus[htSongMenus(SongMenu)].SetSelectedCategory(CSongs.GetRandomCategory());
-                            }
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsSingAll)].Selected)
-                        {
-                            ToggleSongOptions(ESongOptionsView.None);
-                            StartRandomAllSongs();
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsSingAllVisible)].Selected)
-                        {
-                            ToggleSongOptions(ESongOptionsView.None);
-                            StartRandomVisibleSongs();
-                        }
-                        else if (Buttons[htButtons(ButtonOptionsOpenPlaylist)].Selected)
-                        {
-                            OpenPlaylistAction();
-                        }
                     }
-                    if (MouseEvent.RB)
+                }
+                else if (MouseEvent.LB && IsMouseOver(MouseEvent))
+                {
+                    if (Buttons[htButtons(ButtonOpenOptions)].Selected)
                     {
-                        ToggleSongOptions(ESongOptionsView.None);
+                        ToggleSongOptions(ESongOptionsView.General);
                     }
                 }
             }
+
             else
             {
-                if(MouseEvent.RB || MouseEvent.LB)
+                if (MouseEvent.LB && IsMouseOver(MouseEvent))
-                    SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
+                {
+                    if (Buttons[htButtons(ButtonOptionsClose)].Selected)
+                    {
+                        ToggleSongOptions(ESongOptionsView.None);
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsSing)].Selected)
+                    {
+                        ToggleSongOptions(ESongOptionsView.None);
+                        StartSong(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
+                    {
+                        OpenAndAddPlaylistAction();
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsRandom)].Selected)
+                    {
+                        if (CSongs.Category != -1)
+                        {
+                            SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
+                        }
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsRandomCategory)].Selected)
+                    {
+                        if (CSongs.Category == -1)
+                        {
+                            SongMenus[htSongMenus(SongMenu)].SetSelectedCategory(CSongs.GetRandomCategory());
+                        }
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsSingAll)].Selected)
+                    {
+                        ToggleSongOptions(ESongOptionsView.None);
+                        StartRandomAllSongs();
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsSingAllVisible)].Selected)
+                    {
+                        ToggleSongOptions(ESongOptionsView.None);
+                        StartRandomVisibleSongs();
+                    }
+                    else if (Buttons[htButtons(ButtonOptionsOpenPlaylist)].Selected)
+                    {
+                        OpenPlaylistAction();
+                    }
+                }
+                if (MouseEvent.RB)
+                {
+                    ToggleSongOptions(ESongOptionsView.None);
+                }
             }
 
             return true;