Revert video-full-screen.
This commit is contained in:
1 parent
1d465f5f2b
commit
e6a3281d71
5 files changed
+2
-88
No files matched your search
@@ -143,16 +143,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
_SongMenu.SetSmallView(SmallView);
|
_SongMenu.SetSmallView(SmallView);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ToggleVideoFull()
|
|
||||||
{
|
|
||||||
_SongMenu.ToggleVideoFull();
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsVideoFull()
|
|
||||||
{
|
|
||||||
return _SongMenu.IsVideoFull();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion ISongMenu
|
#endregion ISongMenu
|
||||||
|
|
||||||
#region IMenuElement
|
#region IMenuElement
|
||||||
|
|||||||
@@ -484,9 +484,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
_timer.Stop();
|
_timer.Stop();
|
||||||
_timer.Reset();
|
_timer.Reset();
|
||||||
_SelectedInternal = _SelectedPending;
|
_SelectedInternal = _SelectedPending;
|
||||||
|
|
||||||
if (IsVideoFull())
|
|
||||||
ToggleVideoFull();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void HandleInput(ref KeyEvent KeyEvent)
|
public virtual void HandleInput(ref KeyEvent KeyEvent)
|
||||||
@@ -556,17 +553,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void ToggleVideoFull()
|
|
||||||
{
|
|
||||||
if (!_Initialized)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool IsVideoFull()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void UnloadTextures()
|
public virtual void UnloadTextures()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
private int _actualSelection = -1;
|
private int _actualSelection = -1;
|
||||||
|
|
||||||
private bool _SmallView = false;
|
private bool _SmallView = false;
|
||||||
private bool _VidFull = false;
|
|
||||||
|
|
||||||
public override int GetActualSelection()
|
public override int GetActualSelection()
|
||||||
{
|
{
|
||||||
@@ -360,10 +359,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
}
|
}
|
||||||
else if (_PreviewSelected != -1 && MouseEvent.LB && CSongs.Category != -1)
|
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))
|
if (CHelper.IsInBounds(_CoverBig.Rect, MouseEvent) || CHelper.IsInBounds(_TextBG.Rect, MouseEvent))
|
||||||
{
|
{
|
||||||
_Locked = _PreviewSelected;
|
_Locked = _PreviewSelected;
|
||||||
@@ -380,10 +375,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (MouseEvent.LB && CHelper.IsInBounds(_VideoIcon.Rect, MouseEvent))
|
|
||||||
{
|
|
||||||
ToggleVideoFull();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (MouseEvent.Wheel > 0)
|
if (MouseEvent.Wheel > 0)
|
||||||
{
|
{
|
||||||
@@ -480,17 +471,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
_TextBG.Draw();
|
_TextBG.Draw();
|
||||||
|
|
||||||
if (_vidtex.index != -1 && _Video != -1)
|
if (_vidtex.index != -1 && _Video != -1)
|
||||||
{
|
|
||||||
if (_VidFull)
|
|
||||||
{
|
|
||||||
RectangleF bounds = new RectangleF(0, 0, CSettings.iRenderW, CSettings.iRenderH);
|
|
||||||
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),
|
|
||||||
_vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
RectangleF bounds = new RectangleF(_CoverBig.Rect.X, _CoverBig.Rect.Y, _CoverBig.Rect.W, _CoverBig.Rect.H);
|
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 rect = new RectangleF(0f, 0f, _vidtex.width, _vidtex.height);
|
||||||
@@ -501,7 +481,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
CDraw.DrawTextureReflection(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
|
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);
|
_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;
|
return _SmallView;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void ToggleVideoFull()
|
|
||||||
{
|
|
||||||
_VidFull = !_VidFull;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsVideoFull()
|
|
||||||
{
|
|
||||||
return _VidFull;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void LoadTextures()
|
public override void LoadTextures()
|
||||||
{
|
{
|
||||||
base.LoadTextures();
|
base.LoadTextures();
|
||||||
|
|||||||
@@ -33,9 +33,6 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
bool IsVisible();
|
bool IsVisible();
|
||||||
void SetVisible(bool Visible);
|
void SetVisible(bool Visible);
|
||||||
|
|
||||||
void ToggleVideoFull();
|
|
||||||
bool IsVideoFull();
|
|
||||||
|
|
||||||
bool IsSmallView();
|
bool IsSmallView();
|
||||||
void SetSmallView(bool SmallView);
|
void SetSmallView(bool SmallView);
|
||||||
|
|
||||||
|
|||||||
@@ -147,9 +147,7 @@ namespace Vocaluxe.Screens
|
|||||||
switch (KeyEvent.Key)
|
switch (KeyEvent.Key)
|
||||||
{
|
{
|
||||||
case Keys.Escape:
|
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);
|
CGraphics.FadeTo(EScreens.ScreenMain);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -157,11 +155,7 @@ namespace Vocaluxe.Screens
|
|||||||
if (CSongs.NumVisibleSongs > 0)
|
if (CSongs.NumVisibleSongs > 0)
|
||||||
{
|
{
|
||||||
if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
|
if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
|
||||||
{
|
|
||||||
ToggleSongOptions(ESongOptionsView.Song);
|
ToggleSongOptions(ESongOptionsView.Song);
|
||||||
if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
|
|
||||||
SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -186,8 +180,6 @@ namespace Vocaluxe.Screens
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case Keys.Space:
|
case Keys.Space:
|
||||||
if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
|
|
||||||
SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
|
|
||||||
ToggleSongOptions(ESongOptionsView.General);
|
ToggleSongOptions(ESongOptionsView.General);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -201,8 +193,6 @@ namespace Vocaluxe.Screens
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
_SearchActive = true;
|
_SearchActive = true;
|
||||||
if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
|
|
||||||
SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -231,8 +221,6 @@ namespace Vocaluxe.Screens
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
_SearchActive = true;
|
_SearchActive = true;
|
||||||
if (SongMenus[htSongMenus(SongMenu)].IsVideoFull())
|
|
||||||
SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -261,7 +249,7 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if(!SongMenus[htSongMenus(SongMenu)].IsVideoFull())
|
else
|
||||||
{
|
{
|
||||||
switch (KeyEvent.Key)
|
switch (KeyEvent.Key)
|
||||||
{
|
{
|
||||||
@@ -315,20 +303,10 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (KeyEvent.Key == Keys.V)
|
|
||||||
{
|
|
||||||
if (CSongs.Category != -1)
|
|
||||||
{
|
|
||||||
SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool HandleMouse(MouseEvent MouseEvent)
|
public override bool HandleMouse(MouseEvent MouseEvent)
|
||||||
{
|
|
||||||
if (!SongMenus[htSongMenus(SongMenu)].IsVideoFull())
|
|
||||||
{
|
{
|
||||||
base.HandleMouse(MouseEvent);
|
base.HandleMouse(MouseEvent);
|
||||||
|
|
||||||
@@ -438,12 +416,6 @@ namespace Vocaluxe.Screens
|
|||||||
ToggleSongOptions(ESongOptionsView.None);
|
ToggleSongOptions(ESongOptionsView.None);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(MouseEvent.RB || MouseEvent.LB)
|
|
||||||
SongMenus[htSongMenus(SongMenu)].ToggleVideoFull();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user