diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml index 73bc8846..a1972d22 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Ambient/Skin Blue.xml @@ -44,6 +44,12 @@ 0.500 1.000 + + 0.675 + 0.890 + 0.969 + 0.200 + 0.000 0.000 diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml index 50f6e329..6dcd8236 100644 --- a/Output/Themes/Ambient/Skin Green.xml +++ b/Output/Themes/Ambient/Skin Green.xml @@ -44,6 +44,12 @@ 0.500 1.000 + + 0.709 + 0.968 + 0.674 + 0.200 + 0.000 0.750 diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml index 1b97acb1..56f21910 100644 --- a/Output/Themes/Ambient/Skin Red.xml +++ b/Output/Themes/Ambient/Skin Red.xml @@ -44,6 +44,12 @@ 0.500 1.000 + + 0.968 + 0.674 + 0.674 + 0.200 + 0.750 0.000 diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml index a6f36b3c..45e030fe 100644 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ b/Output/Themes/Ambient/Skin Yellow.xml @@ -44,6 +44,12 @@ 0.500 1.000 + + 0.968 + 0.956 + 0.674 + 0.200 + 0.750 0.750 diff --git a/Output/Themes/Changelog/Changelog_SkinSystem.txt b/Output/Themes/Changelog/Changelog_SkinSystem.txt index ce2085ae..16bf841b 100644 --- a/Output/Themes/Changelog/Changelog_SkinSystem.txt +++ b/Output/Themes/Changelog/Changelog_SkinSystem.txt @@ -1,5 +1,9 @@ Skin System +++++++++++ +Version 5: +Added optional to be able to colour the note lines (Fallback to gray with 0.2 Alpha if not set) + ++++++++++ Version 4: All Colors in (Playercolors and ColorSchemes) @@ -12,9 +16,6 @@ Added videos: -++++++++++ - - ++++++++++ Version 2: diff --git a/VocaluxeLib/Menu/SingNotes/CNoteBars.cs b/VocaluxeLib/Menu/SingNotes/CNoteBars.cs index 7bb3d3c0..f5ac5eaa 100644 --- a/VocaluxeLib/Menu/SingNotes/CNoteBars.cs +++ b/VocaluxeLib/Menu/SingNotes/CNoteBars.cs @@ -32,6 +32,7 @@ namespace VocaluxeLib.Menu.SingNotes private readonly int _Player; public readonly SRectF Rect; private readonly SColorF _Color; + private readonly SColorF _NoteLinesColor; public float Alpha = 1; private readonly CSongLine[] _Lines; @@ -60,6 +61,8 @@ 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 * Alpha); SPlayer playerData = CBase.Game.GetPlayers()[player]; _Lines = CBase.Game.GetSong().Notes.GetVoice(playerData.VoiceNr).Lines; @@ -88,7 +91,7 @@ namespace VocaluxeLib.Menu.SingNotes CSongLine line = _Lines[_CurrentLine]; if (CBase.Config.GetDrawNoteLines() == EOffOn.TR_CONFIG_ON) - _DrawNoteLines(new SColorF(Color.Gray, 0.5f * Alpha)); + _DrawNoteLines(_NoteLinesColor); float beats = line.LastNoteBeat - line.FirstNoteBeat + 1;