Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of https://github.com/HydrogenC/FlaxEngine into HydrogenC-master

Browse Source
This commit is contained in:
Wojciech Figat
2024-02-18 16:11:31 +01:00
parent 4df8a12666 4497b2ca7d
commit 45aa0e1b65
29 changed files with 1762 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Scripting/Scripting.cs
+6 -8
View File
@@ -294,14 +294,12 @@ namespace FlaxEngine
style.DragWindow = style.BackgroundSelected * 0.7f;
// Use optionally bundled default font (matches Editor)
var defaultFont = Content.LoadAsyncInternal<FontAsset>("Editor/Fonts/Roboto-Regular");
if (defaultFont)
{
style.FontTitle = defaultFont.CreateFont(18);
style.FontLarge = defaultFont.CreateFont(14);
style.FontMedium = defaultFont.CreateFont(9);
style.FontSmall = defaultFont.CreateFont(9);
}
FontAsset defaultFont = Content.LoadAsyncInternal<FontAsset>("Editor/Fonts/Roboto-Regular");
style.FontTitle = new FontReference(defaultFont, 18).GetFont();
style.FontLarge = new FontReference(defaultFont, 14).GetFont();
style.FontMedium = new FontReference(defaultFont, 9).GetFont();
style.FontSmall = new FontReference(defaultFont, 9).GetFont();
Style.Current = style;
}