test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-01 19:49:11 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve vgcanvas_nanovg_set_font

Browse Source
This commit is contained in:
lixianjing 2019-10-29 11:21:37 +08:00
parent a61dd12873
commit 41467a0920
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vgcanvas/vgcanvas_nanovg.inc
View File

@ -4,6 +4,7 @@
#include "base/vgcanvas.h"
#include "base/system_info.h"
#include "base/image_manager.h"
#include "base/font_manager.h"
#include "base/assets_manager.h"
static ret_t vgcanvas_nanovg_reset(vgcanvas_t* vgcanvas) {
@ -246,7 +247,12 @@ static ret_t vgcanvas_nanovg_set_font(vgcanvas_t* vgcanvas, const char* name) {
return RET_OK;
}
r = assets_manager_ref(am, ASSET_TYPE_FONT, name);
if (r == NULL) {
font_t* font = font_manager_get_font(font_manager(), NULL, TK_DEFAULT_FONT_SIZE);
if (font != NULL) {
r = assets_manager_ref(assets_manager(), ASSET_TYPE_FONT, font->name);
}
}
}
if (r != NULL && r->subtype == ASSET_TYPE_FONT_TTF) {