diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml index bec4a1c6..88edeb74 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Ambient/Skin Blue.xml @@ -50,6 +50,12 @@ 0.969 0.500 + + 0.675 + 0.890 + 0.969 + 1.000 + 0.000 0.000 diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml index 2185cf6b..d946ab0a 100644 --- a/Output/Themes/Ambient/Skin Green.xml +++ b/Output/Themes/Ambient/Skin Green.xml @@ -50,6 +50,12 @@ 0.674 0.500 + + 0.709 + 0.968 + 0.674 + 1.000 + 0.000 0.750 diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml index a44a3c74..b55dd210 100644 --- a/Output/Themes/Ambient/Skin Red.xml +++ b/Output/Themes/Ambient/Skin Red.xml @@ -50,6 +50,12 @@ 0.674 0.500 + + 0.968 + 0.674 + 0.674 + 1.000 + 0.750 0.000 diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml index 3bb4f4a7..d1a53735 100644 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ b/Output/Themes/Ambient/Skin Yellow.xml @@ -50,6 +50,12 @@ 0.674 0.500 + + 0.968 + 0.956 + 0.674 + 1.000 + 0.750 0.750 diff --git a/VocaluxeLib/Menu/SingNotes/CNoteBars.cs b/VocaluxeLib/Menu/SingNotes/CNoteBars.cs index fb9ac50c..f817e2f1 100644 --- a/VocaluxeLib/Menu/SingNotes/CNoteBars.cs +++ b/VocaluxeLib/Menu/SingNotes/CNoteBars.cs @@ -33,6 +33,7 @@ namespace VocaluxeLib.Menu.SingNotes public readonly SRectF Rect; private readonly SColorF _Color; private readonly SColorF _NoteLinesColor; + private readonly SColorF _NoteBaseColor; public float Alpha = 1; private readonly CSongLine[] _Lines; @@ -61,9 +62,13 @@ namespace VocaluxeLib.Menu.SingNotes Rect = rect; _Color = CBase.Themes.GetPlayerColor(player + 1); + if (!CBase.Themes.GetColor("NoteLinesColor", _PartyModeID, out _NoteLinesColor)) _NoteLinesColor = new SColorF(Color.Gray, 0.5f); + if (!CBase.Themes.GetColor("NoteBaseColor", _PartyModeID, out _NoteBaseColor)) + _NoteBaseColor = new SColorF(Color.White); + SPlayer playerData = CBase.Game.GetPlayers()[player]; _Lines = CBase.Game.GetSong().Notes.GetVoice(playerData.VoiceNr).Lines; _NoteLineHeight = Rect.H / CBase.Settings.GetNumNoteLines(); @@ -105,7 +110,7 @@ namespace VocaluxeLib.Menu.SingNotes SRectF rect = _GetNoteRect(note); _DrawNoteBG(rect, color); - _DrawNoteBase(rect, new SColorF(Color.White, Alpha), 1f); + _DrawNoteBase(rect, new SColorF(_NoteBaseColor, _NoteBaseColor.A * Alpha), 1f); } }