Merge branch 'develop' into Font_Rewrite

This commit is contained in:
Flamefire committed 2013-04-30 19:47:35 +02:00
commit b54a4c3608
13 files changed
+286 -91

No files matched your search

+17 -1
View File
@@ -346,7 +346,23 @@ namespace VocaluxeLib.Menu
Selection = -1;
}
public void KeyboardSelection(bool active, int player)
public void HandleMouse(SMouseEvent mevent)
{
for (int i = 0; i < _Tiles.Count; i++ )
{
if (CHelper.IsInBounds(_Tiles[i].Avatar.Rect, mevent))
{
_ActualSelection = i;
if (Offset * _Tiles.Count + _ActualSelection < _VisibleProfiles.Count)
Selection = _VisibleProfiles[Offset * _Tiles.Count + _ActualSelection];
else
Selection = -1;
}
}
}
public void FastSelection(bool active, int player)
{
//Overwrite player-selection; Same profile, but other player
if (active && Selection != -1)
+1 -1
View File
@@ -1138,8 +1138,8 @@ namespace VocaluxeLib.Menu
{
if (playlistID > -1 && playlistID < CBase.Playlist.GetNumPlaylists())
{
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID);
ActivePlaylistID = playlistID;
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID);
_PlaylistElementContents.Clear();
for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(ActivePlaylistID); i++)
{
+8
View File
@@ -272,6 +272,14 @@ namespace VocaluxeLib.Menu
// ReSharper restore InconsistentNaming
}
public enum ELyricsPosition
{
TR_CONFIG_LYRICSPOSITION_BOTTOM,
TR_CONFIG_LYRICSPOSITION_TOP,
TR_CONFIG_LYRICSPOSITION_BOTH,
TR_CONFIG_LYRICSPOSITION_DYNAMIC
}
public enum ELyricStyle
{
Fill,