diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index 3668479b..4f72ac8f 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -991,6 +991,7 @@ 8 10 10 + 7 diff --git a/PitchTracker/bin/Release.x64/PitchTracker.iobj b/PitchTracker/bin/Release.x64/PitchTracker.iobj index b84bbdf9..8b333127 100644 Binary files a/PitchTracker/bin/Release.x64/PitchTracker.iobj and b/PitchTracker/bin/Release.x64/PitchTracker.iobj differ diff --git a/PitchTracker/bin/Release.x64/PitchTracker.ipdb b/PitchTracker/bin/Release.x64/PitchTracker.ipdb index a08a5b9d..60f9921f 100644 Binary files a/PitchTracker/bin/Release.x64/PitchTracker.ipdb and b/PitchTracker/bin/Release.x64/PitchTracker.ipdb differ diff --git a/Vocaluxe.VC.db b/Vocaluxe.VC.db index 7e429941..1cf174b9 100644 Binary files a/Vocaluxe.VC.db and b/Vocaluxe.VC.db differ diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index a44393a3..5d4a65f1 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -93,6 +93,10 @@ namespace VocaluxeLib.Menu.SongMenu /// public float SpaceH; + /// + /// Number of visible Records + /// + public int NumRecords; /* RECORDSTYLE_ONE = One per Player RECORDSTYLE_DIFFICULTY = One per Player per Difficulty diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs index f86867bc..c23251ad 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs @@ -56,6 +56,9 @@ namespace VocaluxeLib.Menu.SongMenu private int _ListLength; private float _ListTextWidth; + private int _NumRecords; + private ERecordStyle _RecordStyle; + // Offset is the song or categoryNr of the tile in the left upper corner private int _Offset; @@ -118,6 +121,8 @@ namespace VocaluxeLib.Menu.SongMenu _ListLength = _Theme.SongMenuListRecord.ListLength; _SpaceW = _Theme.SongMenuListRecord.SpaceW; _SpaceH = _Theme.SongMenuListRecord.SpaceH; + _NumRecords = _Theme.SongMenuListRecord.NumRecords; + _RecordStyle = _Theme.SongMenuListRecord.RecordStyle; _Artist = new CText(_Theme.SongMenuListRecord.TextArtist, _PartyModeID); _Title = new CText(_Theme.SongMenuListRecord.TextTitle, _PartyModeID); _SongLength = new CText(_Theme.SongMenuListRecord.TextSongLength, _PartyModeID); @@ -243,11 +248,11 @@ namespace VocaluxeLib.Menu.SongMenu SRectF rect = _Theme.SongMenuListRecord.TileRectRecord; _Records = new List(); - for (int i = 0; i < 5; i++) + for (int i = 0; i < _NumRecords; i++) { //Create text for Record - var textRect = new SRectF(rect.X, rect.Y + i * (rect.H / 5), rect.W, rect.H / 5, rect.Z); + var textRect = new SRectF(rect.X, rect.Y + i * (rect.H / _NumRecords), rect.W, rect.H / _NumRecords, rect.Z); CText text = new CText(textRect.X, textRect.Y, textRect.Z, textRect.H, textRect.W, EAlignment.Left, EStyle.Normal, "Normal", _Artist.Color, ""); @@ -368,14 +373,12 @@ namespace VocaluxeLib.Menu.SongMenu if (song == null) return; - ERecordStyle recordStyle = _Theme.SongMenuListRecord.RecordStyle; - List _Scores = CBase.DataBase.LoadScore(song.ID,EGameMode.TR_GAMEMODE_NORMAL, EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_ALL); List players = new List(); - if (recordStyle.Equals(ERecordStyle.RECORDSTYLE_ALL)) + if (_RecordStyle.Equals(ERecordStyle.RECORDSTYLE_ALL)) { - for(int i = 0; i < 5; i++) + for(int i = 0; i < _Records.Count; i++) { if (i < _Scores.Count) { @@ -390,7 +393,7 @@ namespace VocaluxeLib.Menu.SongMenu else { int k = 0; - for (int i = 0; i < 5; i++) + for (int i = 0; i < _Records.Count; i++) { if (k < _Scores.Count) { @@ -398,7 +401,7 @@ namespace VocaluxeLib.Menu.SongMenu String recordName = ""; - if (recordStyle.Equals(ERecordStyle.RECORDSTYLE_DIFFICULTY)) + if (_RecordStyle.Equals(ERecordStyle.RECORDSTYLE_DIFFICULTY)) { recordName = score.Name + score.Difficulty; } @@ -414,7 +417,7 @@ namespace VocaluxeLib.Menu.SongMenu { score = _Scores[k]; - if (recordStyle.Equals(ERecordStyle.RECORDSTYLE_DIFFICULTY)) + if (_RecordStyle.Equals(ERecordStyle.RECORDSTYLE_DIFFICULTY)) { recordName = score.Name + score.Difficulty; } @@ -448,7 +451,7 @@ namespace VocaluxeLib.Menu.SongMenu private void _ResetRecords() { - for (int i = 0; i < 5; i++) + for (int i = 0; i < _Records.Count; i++) { _Records[i].Text = ""; }