Merge remote-tracking branch 'remotes/flokuep/Font_Rewrite' into develop
Conflicts: Vocaluxe/Base/CBackgroundMusic.cs Vocaluxe/Base/CMain.cs Vocaluxe/Base/CTheme.cs Vocaluxe/Base/Font/CGlyph.cs Vocaluxe/Lib/Draw/CDirect3D.cs Vocaluxe/Lib/Draw/CDrawWinForm.cs Vocaluxe/Lib/Draw/COpenGL.cs Vocaluxe/Program.cs Vocaluxe/Screens/CScreenCredits.cs Vocaluxe/Screens/CScreenMain.cs Vocaluxe/Screens/CScreenOptionsTheme.cs Vocaluxe/Screens/CScreenSing.cs Vocaluxe/Vocaluxe.csproj VocaluxeLib/Menu/IMenu.cs
This commit is contained in:
commit
4161652a1d
57 files changed
+1803
-2146
No files matched your search
@@ -19,6 +19,7 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using VocaluxeLib.Songs;
|
||||
|
||||
@@ -48,6 +49,11 @@ namespace VocaluxeLib
|
||||
B = color.B;
|
||||
A = color.A;
|
||||
}
|
||||
|
||||
public Color AsColor()
|
||||
{
|
||||
return Color.FromArgb((int)(A * 255), (int)(R * 255), (int)(G * 255), (int)(B * 255));
|
||||
}
|
||||
}
|
||||
|
||||
public struct SRectF
|
||||
|
||||
Reference in new issue
Block a user