Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

rework imgui font loading a bit

Browse Source 
dont hardcode code ranges, imgui can do that dynamically now
This commit is contained in:
Green Sky
2025-11-04 22:28:27 +01:00
parent 2f6f240ad9
commit 1f004cbd6d
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/start_screen.cpp
View File

@@ -82,36 +82,17 @@ StartScreen::StartScreen(const std::vector<std::string_view>& args, SDL_Renderer
display_scale = 1.f; display_scale = 1.f;
} }
ImGui::GetIO().FontGlobalScale = display_scale;
ImGui::GetStyle().FontSizeBase = _conf.get_int("ImGuiFonts", "size").value_or(13);
{ {
auto* font_atlas = ImGui::GetIO().Fonts; auto* font_atlas = ImGui::GetIO().Fonts;
font_atlas->ClearFonts(); font_atlas->ClearFonts();
// for now we also always merge // for now we also always merge
//bool has_font {false};
ImFontGlyphRangesBuilder glyphbld;
ImVector<ImWchar> glyph_ranges;
{ // build ranges
glyphbld.AddRanges(font_atlas->GetGlyphRangesDefault());
glyphbld.AddRanges(font_atlas->GetGlyphRangesGreek());
glyphbld.AddRanges(font_atlas->GetGlyphRangesCyrillic());
glyphbld.AddRanges(font_atlas->GetGlyphRangesChineseSimplifiedCommon()); // contains CJK
glyphbld.AddText("™"); // somehow missing
// popular emojies
glyphbld.AddText(u8"😂❤️🤣👍😭🙏😘🥰😍😊🎉😁💕🥺😅🔥☺️🤦♥️🤷🙄😆🤗😉🎂🤔👏🙂😳🥳😎👌💜😔💪✨💖👀😋😏😢👉💗😩💯🌹💞🎈💙😃😡💐😜🙈🤞😄🤤🙌🤪❣️😀💋💀👇💔😌💓🤩🙃😬😱😴🤭😐🌞😒😇🌸😈🎶✌️🎊🥵😞💚☀️🖤💰😚👑🎁💥🙋☹️😑🥴👈💩✅👋🤮😤🤢🌟❗😥🌈💛😝😫😲🖕‼️🔴🌻🤯💃👊🤬🏃😕👁️⚡☕🍀💦⭐🦋🤨🌺😹🤘🌷💝💤🤝🐰😓💘🍻😟😣🧐😠🤠😻🌙😛🤙🙊");
if (const auto sv_opt = _conf.get_string("ImGuiFonts", "atlas_extra_text"); sv_opt.has_value) {
glyphbld.AddText(sv_opt.s.start, sv_opt.s.start+sv_opt.s.extend);
}
glyphbld.BuildRanges(&glyph_ranges);
}
ImFontConfig fontcfg; ImFontConfig fontcfg;
//fontcfg.SizePixels = 16.f*display_scale; // defaults
fontcfg.SizePixels = _conf.get_int("ImGuiFonts", "size").value_or(13) * display_scale; fontcfg.OversampleH = fontcfg.OversampleV = 1;
fontcfg.RasterizerDensity = 1.f; fontcfg.PixelSnapH = true;
fontcfg.OversampleH = 0;
fontcfg.OversampleV = 0;
fontcfg.MergeMode = false;
#if defined(IMGUI_ENABLE_FREETYPE) && defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG) #if defined(IMGUI_ENABLE_FREETYPE) && defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG)
std::cout << "Font: enabling freetype color loading\n"; std::cout << "Font: enabling freetype color loading\n";
fontcfg.FontLoaderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor; fontcfg.FontLoaderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor;
@@ -125,16 +106,14 @@ StartScreen::StartScreen(const std::vector<std::string_view>& args, SDL_Renderer
std::cout << "Font: loading '" << font_path << "'\n"; std::cout << "Font: loading '" << font_path << "'\n";
const auto* resulting_font = font_atlas->AddFontFromFileTTF( const auto* resulting_font = font_atlas->AddFontFromFileTTF(
font_path.c_str(), font_path.c_str(),
_conf.get_int("ImGuiFonts", "size", font_path).value_or(0) * display_scale, 0.f,
&fontcfg, &fontcfg
&(glyph_ranges[0])
); );
if (resulting_font != nullptr) { if (resulting_font != nullptr) {
//has_font = true;
fontcfg.MergeMode = true; fontcfg.MergeMode = true;
} else { } else {
std::cerr << "Font: failed to load '" << "path" << "' !\n"; std::cerr << "Font: failed to load '" << font_path << "' !\n";
} }
} }

5
src/tox_avatar_manager.cpp
View File

@@ -297,6 +297,11 @@ void ToxAvatarManager::checkObj(ObjectHandle o) {
// like set "accepted" tag comp or something // like set "accepted" tag comp or something
std::cout << "TAM: accepted avatar ft\n"; std::cout << "TAM: accepted avatar ft\n";
} else {
// in progress, or canceled/aborted
// TODO: canceled tag with reason??
//if (o.all_of<ObjComp::Ephemeral::ToxTransferFriend
} }
} }