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

Merge pull request #456 from Vocaluxe/DuetIssuesFix

Browse Source 
Fixing some duet display issues after pull request #454
This commit is contained in:
daggeg authored and GitHub committed 2020-01-18 15:20:52 +01:00
2 parents f86b6f6db7 0dbb07d30d
commit 8b53d00494
1 file changed
+6 -12
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSing.cs
+6 -12
View File
@@ -464,17 +464,11 @@ namespace Vocaluxe.Screens
if (alpha.Length > 2) if (alpha.Length > 2)
{ {
_Lyrics[_LyricMainDuet].Alpha = alpha[0]; _Lyrics[_LyricMainDuet].Alpha = alpha[2];
_Lyrics[_LyricSubDuet].Alpha = alpha[1]; _Lyrics[_LyricSubDuet].Alpha = alpha[3];
_Statics[_StaticLyricsDuet].Alpha = alpha[0]; _Statics[_StaticLyricsDuet].Alpha = alpha[2];
_Statics[_StaticLyricHelperDuet].Alpha = alpha[0]; _Statics[_StaticLyricHelperDuet].Alpha = alpha[2];
_Lyrics[_LyricMain].Alpha = alpha[2];
_Lyrics[_LyricSub].Alpha = alpha[3];
_Statics[_StaticLyrics].Alpha = alpha[2];
_Statics[_StaticLyricHelper].Alpha = alpha[2];
} }
} }
@@ -666,7 +660,7 @@ namespace Vocaluxe.Screens
timer.Stop(); timer.Stop();
} }
} }
else if (!timer.IsRunning && timer.ElapsedMilliseconds == 0 && _Lyrics[_LyricMainDuet].Alpha > 0 && CGame.GetSong().IsDuet) else if (!timer.IsRunning && timer.ElapsedMilliseconds == 0 && _Lyrics[_LyricMainTop].Alpha > 0 && CGame.GetSong().IsDuet)
timer.Start(); timer.Start();
else else
textName.Visible = false; textName.Visible = false;
@@ -699,7 +693,7 @@ namespace Vocaluxe.Screens
_TimerDuetText2.Stop(); _TimerDuetText2.Stop();
} }
} }
else if (!_TimerDuetText2.IsRunning && _TimerDuetText2.ElapsedMilliseconds == 0 && _Lyrics[_LyricMain].Alpha > 0 && CGame.GetSong().IsDuet) else if (!_TimerDuetText2.IsRunning && _TimerDuetText2.ElapsedMilliseconds == 0 && _Lyrics[_LyricMainDuet].Alpha > 0 && CGame.GetSong().IsDuet)
_TimerDuetText2.Start(); _TimerDuetText2.Start();
else else
_Texts[_TextDuetName2].Visible = false; _Texts[_TextDuetName2].Visible = false;