maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2297 from MoritzBrueckner/ui-font-fix

Browse source 
Canvas: fix using non-default fonts
This commit is contained in:
Lubos Lenco 2021-08-05 22:13:30 +02:00 committed by GitHub
parent b664e3a010 4c4bebcf4f
commit 52a594c910
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Sources/armory/trait/internal/CanvasScript.hx
View file

@ -40,20 +40,27 @@ class CanvasScript extends Trait {
Canvas.themes.push(armory.ui.Themes.light);
}
iron.data.Data.getFont(font, function(f: kha.Font) {
iron.data.Data.getFont(font, function(defaultFont: kha.Font) {
var c: TCanvas = haxe.Json.parse(blob.toString());
if (c.theme == null) c.theme = Canvas.themes[0].NAME;
cui = new Zui({font: f, theme: Canvas.getTheme(c.theme)});
cui = new Zui({font: defaultFont, theme: Canvas.getTheme(c.theme)});
if (c.assets == null || c.assets.length == 0) canvas = c;
else { // Load canvas assets
var loaded = 0;
for (asset in c.assets) {
var file = asset.name;
iron.data.Data.getImage(file, function(image: kha.Image) {
Canvas.assetMap.set(asset.id, image);
if (++loaded >= c.assets.length) canvas = c;
});
if (Canvas.isFontAsset(file)) {
iron.data.Data.getFont(file, function(f: kha.Font) {
Canvas.assetMap.set(asset.id, f);
if (++loaded >= c.assets.length) canvas = c;
});
} else {
iron.data.Data.getImage(file, function(image: kha.Image) {
Canvas.assetMap.set(asset.id, image);
if (++loaded >= c.assets.length) canvas = c;
});
}
}
}
});

2
Sources/armory/ui/Canvas.hx
View file

@ -258,7 +258,7 @@ class Canvas {
return Std.int(f * _ui.SCALE());
}
static inline function isFontAsset(assetName: Null<String>): Bool {
public static inline function isFontAsset(assetName: Null<String>): Bool {
return assetName != null && StringTools.endsWith(assetName.toLowerCase(), ".ttf");
}