Merge branch 'develop' into ButtonFilterToPlaylist

This commit is contained in:
Stefan authored and GitHub committed 2020-02-04 16:25:53 +01:00
commit 54a215065f
4 files changed
+13 -11

No files matched your search

+4 -4
View File
@@ -1004,16 +1004,16 @@
<SpaceW>10</SpaceW> <SpaceW>10</SpaceW>
<SpaceH>10</SpaceH> <SpaceH>10</SpaceH>
<TileRect> <TileRect>
<X>375</X> <X>410</X>
<Y>42</Y> <Y>42</Y>
<W>850</W> <W>830</W>
<H>555</H> <H>555</H>
<Z>-1</Z> <Z>-1</Z>
</TileRect> </TileRect>
<TileRectSmall> <TileRectSmall>
<X>375</X> <X>410</X>
<Y>42</Y> <Y>42</Y>
<W>450</W> <W>410</W>
<H>550</H> <H>550</H>
<Z>-1</Z> <Z>-1</Z>
</TileRectSmall> </TileRectSmall>
+4 -4
View File
@@ -171,10 +171,10 @@ namespace VocaluxeLib
public static SRectF Scale(this SRectF rect, float scale) public static SRectF Scale(this SRectF rect, float scale)
{ {
return new SRectF( return new SRectF(
rect.X - rect.W * (scale - 1f), rect.X - rect.W * (scale - 1f) * 0.5f,
rect.Y - rect.H * (scale - 1f), rect.Y - rect.H * (scale - 1f) * 0.5f,
rect.W + 2 * rect.W * (scale - 1f), rect.W * scale,
rect.H + 2 * rect.H * (scale - 1f), rect.H * scale,
rect.Z); rect.Z);
} }
+2 -2
View File
@@ -176,12 +176,12 @@ namespace VocaluxeLib.Menu.SongMenu
for (int i = 0; i < _ListLength; i++) for (int i = 0; i < _ListLength; i++)
{ {
//Create Cover //Create Cover
var rect = new SRectF(Rect.X + (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z); var rect = new SRectF(Rect.X, Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
var tile = new CStatic(_PartyModeID, _CoverBGTexture, _Color, rect); var tile = new CStatic(_PartyModeID, _CoverBGTexture, _Color, rect);
_Tiles.Add(tile); _Tiles.Add(tile);
//Create text //Create text
var textRect = new SRectF(MaxRect.X + 2 * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _ListTextWidth, _TileH, Rect.Z); var textRect = new SRectF(MaxRect.X + (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _ListTextWidth, _TileH, Rect.Z);
CText text = new CText(textRect.X, textRect.Y, textRect.Z, CText text = new CText(textRect.X, textRect.Y, textRect.Z,
textRect.H, textRect.W, EAlignment.Left, EStyle.Normal, textRect.H, textRect.W, EAlignment.Left, EStyle.Normal,
"Normal", _Artist.Color, ""); "Normal", _Artist.Color, "");
+3 -1
View File
@@ -571,6 +571,8 @@ namespace VocaluxeLib.Songs
case ':': case ':':
case '*': case '*':
case 'F': case 'F':
case 'R': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
case 'G': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
string[] noteData = line.Split(splitChars, 4); string[] noteData = line.Split(splitChars, 4);
if (noteData.Length < 4) if (noteData.Length < 4)
{ {
@@ -618,7 +620,7 @@ namespace VocaluxeLib.Songs
if (tag.Equals('*')) if (tag.Equals('*'))
noteType = ENoteType.Golden; noteType = ENoteType.Golden;
else if (tag.Equals('F')) else if (tag.Equals('F') || tag.Equals('R') || tag.Equals('G')) // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
noteType = ENoteType.Freestyle; noteType = ENoteType.Freestyle;
else else
noteType = ENoteType.Normal; noteType = ENoteType.Normal;