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

Merge branch 'master' into rap

Browse Source
This commit is contained in:
Gary Kertopermono committed 2020-03-31 23:57:19 +02:00
2 parents 26655b84dc 81c323363a
commit 8d7116706d
8 files changed
+21 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CPlaylist.cs
+3 -3
View File
@@ -492,7 +492,7 @@ namespace VocaluxeLib.Menu
break;
case Keys.Enter:
_StartPlaylistSong(_CurrentPlaylistElement);
_StartPlaylistSong(_CurrentPlaylistElement + _Offset);
break;
case Keys.Add: //move the selected song up
@@ -818,7 +818,7 @@ namespace VocaluxeLib.Menu
//Start selected song with double click
if (mouseEvent.LD && _CurrentPlaylistElement != -1)
_StartPlaylistSong(_CurrentPlaylistElement);
_StartPlaylistSong(_CurrentPlaylistElement + _Offset);
//Change order with holding LB
if (mouseEvent.LBH && _CurrentPlaylistElement != -1 && _PlaylistElementContents.Count > 0 && DragAndDropSongID == -1)
@@ -1197,4 +1197,4 @@ namespace VocaluxeLib.Menu
}
#endregion ThemeEdit
}
}
}
VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+4 -2
View File
@@ -511,7 +511,9 @@ namespace VocaluxeLib.Menu.SongMenu
}
_TextBG.Draw();
CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
CTextureRef vidtex = null;
if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
if (vidtex != null)
{
@@ -653,4 +655,4 @@ namespace VocaluxeLib.Menu.SongMenu
base.LoadSkin();
}
}
}
}
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+4 -2
View File
@@ -485,7 +485,9 @@ namespace VocaluxeLib.Menu.SongMenu
_TextBG.Draw();
CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
CTextureRef vidtex = null;
if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
if (vidtex != null)
{
@@ -608,4 +610,4 @@ namespace VocaluxeLib.Menu.SongMenu
Init();
}
}
}
}