Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-04 23:36:00 +02:00
Code Activity

Fixed some Win7 compat issues

Browse source
This commit is contained in:
Brian Fiete 2019-09-25 07:51:06 -07:00
parent 54d5884213
commit ad1ba70fdd
5 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BeefLibs/Beefy2D/src/gfx/Font.bf
View file

@ -358,6 +358,8 @@ namespace Beefy.gfx
float usePointSize = pointSize;
mPath = new String();
GetFontPath(fontName, mPath);
if (mPath.IsEmpty)
return false;
String fontPath = scope String(mPath);
if (pointSize == -1)
@ -380,7 +382,10 @@ namespace Beefy.gfx
Font font = new Font();
if (!font.Load(path, pointSize))
{
delete font;
return .Err; //TODO: Make proper error
}
return font;
}

6
BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
View file

@ -359,20 +359,20 @@ namespace Beefy.theme.dark
mHeaderFont.Load("Segoe UI", 11.7f * sScale); //8.8
mHeaderFont.AddAlternate("Segoe UI Symbol", 11.7f * sScale);
mHeaderFont.AddAlternate("Segoe UI Historic", 11.7f * sScale);
mHeaderFont.AddAlternate("Segoe UI Emoji", 11.7f * sScale);
mHeaderFont.AddAlternate("Segoe UI Emoji", 11.7f * sScale).IgnoreError();
mSmallFont.Dispose(true);
mSmallFont.Load("Segoe UI", 12.8f * sScale); // 10.0
mSmallFont.AddAlternate("Segoe UI Symbol", 12.8f * sScale);
mSmallFont.AddAlternate("Segoe UI Historic", 12.8f * sScale);
mSmallFont.AddAlternate("Segoe UI Emoji", 12.8f * sScale);
mSmallFont.AddAlternate("Segoe UI Emoji", 12.8f * sScale).IgnoreError();
mSmallBoldFont.Dispose(true);
mSmallBoldFont.Dispose(true);
mSmallBoldFont.Load("Segoe UI Bold", 12.8f * sScale); // 10.0
mSmallBoldFont.AddAlternate("Segoe UI Symbol", 12.8f * sScale);
mSmallBoldFont.AddAlternate("Segoe UI Historic", 12.8f * sScale);
mSmallBoldFont.AddAlternate("Segoe UI Emoji", 12.8f * sScale);
mSmallBoldFont.AddAlternate("Segoe UI Emoji", 12.8f * sScale).IgnoreError();
/*mSmallBoldFont.Load(StringAppend!(tempStr, BFApp.sApp.mInstallDir, "fonts/segoeuib.ttf"), 12.8f * sScale); // 10.0
mSmallBoldFont.AddAlternate(scope String(BFApp.sApp.mInstallDir, "fonts/segoeui.ttf"), 12.8f * sScale);
mSmallBoldFont.AddAlternate(scope String(BFApp.sApp.mInstallDir, "fonts/seguisym.ttf"), 12.8f * sScale);