ilusha/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-09-26 16:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 45ab425985 into e728936797

Browse source
This commit is contained in:
Turtle Dove 2026-09-24 22:01:29 +09:00 • committed by GitHub
commit dfb0de3146
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
misc/freetype/imgui_freetype.cpp
View file

@ -7,6 +7,7 @@
// CHANGELOG
// (minor and older changes stripped away, please see git history for details)
// 2026/07/19: fixed loading CBDT/COLR bitmap color emoji fonts (NotoColorEmoji, Twemoji COLR) by detecting CBDT table and using FT_Select_Size() instead of FT_Request_Size(). (#6302) [@sakiodre]
// 2025/06/11: refactored for the new ImFontLoader architecture, and ImGuiBackendFlags_RendererHasTextures support.
// 2024/10/17: added plutosvg support for SVG Fonts (seems faster/better than lunasvg). Enable by using '#define IMGUI_ENABLE_FREETYPE_PLUTOSVG'. (#7927)
// 2023/11/13: added support for ImFontConfig::RasterizationDensity field for scaling render density without scaling metrics.
@ -449,6 +450,37 @@ static bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* s
// FT_Set_Pixel_Sizes() doesn't seem to get us the same result."
// (FT_Set_Pixel_Sizes() essentially calls FT_Request_Size() with FT_SIZE_REQUEST_TYPE_NOMINAL)
const float rasterizer_density = src->RasterizerDensity * baked->RasterizerDensity;
// Detect CBDT/COLR bitmap fonts (NotoColorEmoji, Twemoji COLR, etc.) which are not scalable
// and require FT_Select_Size() instead of FT_Request_Size(). (#6302)
FT_ULong cbdt_tag = FT_MAKE_TAG('C', 'B', 'D', 'T');
FT_ULong cbdt_length = 0;
FT_Error cbdt_err = FT_Load_Sfnt_Table(bd_font_data->FtFace, cbdt_tag, 0, nullptr, &cbdt_length);
bool is_cbdt_font = (cbdt_err == 0 && cbdt_length > 0);
if (is_cbdt_font && bd_font_data->FtFace->num_fixed_sizes > 0)
{
// Select the closest available bitmap strike size
int best_match = 0;
FT_Int best_diff = INT_MAX;
FT_Int target_size = (FT_Int)(size * rasterizer_density);
for (int i = 0; i < bd_font_data->FtFace->num_fixed_sizes; i++)
{
FT_Int diff = (FT_Int)bd_font_data->FtFace->available_sizes[i].height - target_size;
if (diff < 0) diff = -diff;
if (diff < best_diff)
{
best_diff = diff;
best_match = i;
}
}
FT_Select_Size(bd_font_data->FtFace, best_match);
// Load color glyphs
bd_font_data->LoadFlags |= FT_LOAD_COLOR;
}
else
{
// Standard scalable font path
FT_Size_RequestRec req;
req.type = (bd_font_data->UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) ? FT_SIZE_REQUEST_TYPE_NOMINAL : FT_SIZE_REQUEST_TYPE_REAL_DIM;
req.width = 0;
@ -456,6 +488,7 @@ static bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* s
req.horiResolution = 0;
req.vertResolution = 0;
FT_Request_Size(bd_font_data->FtFace, &req);
}
// Output
if (src->MergeMode == false)