Add CJK font.

This commit is contained in:
Bartosz Taudul
2026-10-09 22:21:37 +02:00
parent 988f5c0a77
commit 1faedaf04c
3 changed files with 8 additions and 0 deletions
+7
View File
@@ -13,6 +13,7 @@
#include "data/FontBoldItalic.hpp"
#include "data/FontItalic.hpp"
#include "data/FontEmoji.hpp"
#include "data/FontCjk.hpp"
FontData g_fonts;
@@ -41,28 +42,34 @@ void LoadFonts( float scale )
static auto fontBoldItalic = Unembed( FontBoldItalic );
static auto fontItalic = Unembed( FontItalic );
static auto fontEmoji = Unembed( FontEmoji );
static auto fontCjk = Unembed( FontCjk );
io.Fonts->Clear();
g_fonts.normal = io.Fonts->AddFontFromMemoryTTF( (void*)fontNormal->data(), fontNormal->size(), round( 15.0f * scale ), &configBasic );
io.Fonts->AddFontFromMemoryTTF( (void*)fontIcons->data(), fontIcons->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontEmoji->data(), fontEmoji->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontCjk->data(), fontCjk->size(), round( 19.0f * scale ), &configMerge );
g_fonts.mono = io.Fonts->AddFontFromMemoryTTF( (void*)fontFixed->data(), fontFixed->size(), round( 15.0f * scale ), &configFixed );
io.Fonts->AddFontFromMemoryTTF( (void*)fontIcons->data(), fontIcons->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontEmoji->data(), fontEmoji->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontCjk->data(), fontCjk->size(), round( 19.0f * scale ), &configMerge );
g_fonts.bold = io.Fonts->AddFontFromMemoryTTF( (void*)fontBold->data(), fontBold->size(), round( 15.0f * scale ), &configBasic );
io.Fonts->AddFontFromMemoryTTF( (void*)fontIcons->data(), fontIcons->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontEmoji->data(), fontEmoji->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontCjk->data(), fontCjk->size(), round( 19.0f * scale ), &configMerge );
g_fonts.boldItalic = io.Fonts->AddFontFromMemoryTTF( (void*)fontBoldItalic->data(), fontBoldItalic->size(), round( 15.0f * scale ), &configBasic );
io.Fonts->AddFontFromMemoryTTF( (void*)fontIcons->data(), fontIcons->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontEmoji->data(), fontEmoji->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontCjk->data(), fontCjk->size(), round( 19.0f * scale ), &configMerge );
g_fonts.italic = io.Fonts->AddFontFromMemoryTTF( (void*)fontItalic->data(), fontItalic->size(), round( 15.0f * scale ), &configBasic );
io.Fonts->AddFontFromMemoryTTF( (void*)fontIcons->data(), fontIcons->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontEmoji->data(), fontEmoji->size(), round( 14.0f * scale ), &configMerge );
io.Fonts->AddFontFromMemoryTTF( (void*)fontCjk->data(), fontCjk->size(), round( 19.0f * scale ), &configMerge );
FontNormal = round( scale * 15.f );
FontSmall = round( scale * 15 * 2.f / 3.f );