blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 16:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #330 from AdenKoperczak/imgui_unicode_check2

Browse source 
Imgui Unicode Check using FontConfig
This commit is contained in:
Dan Paulat 2025-01-10 10:12:50 -06:00 • committed by GitHub
commit d6f94f2e19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 50 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

61
scwx-qt/source/scwx/qt/manager/font_manager.cpp
View file

@ -472,6 +472,7 @@ FontManager::Impl::MatchFontFile(const std::string& family,
FcPatternAddString(pattern,
FC_FONTFORMAT,
reinterpret_cast<const FcChar8*>(kFcTrueType_.c_str()));
FcPatternAddBool(pattern, FC_SYMBOL, FcFalse);
if (!styles.empty())
{
@ -485,29 +486,51 @@ FontManager::Impl::MatchFontFile(const std::string& family,
FcDefaultSubstitute(pattern);
// Find matching font
FcResult result;
FcPattern* match = FcFontMatch(nullptr, pattern, &result);
FcResult result {};
FcFontSet* matches = FcFontSort(nullptr, pattern, FcFalse, nullptr, &result);
FontRecord record {};
if (match != nullptr)
if (matches != nullptr)
{
FcChar8* fcFamily;
FcChar8* fcStyle;
FcChar8* fcFile;
// Match was found, get properties
if (FcPatternGetString(match, FC_FAMILY, 0, &fcFamily) == FcResultMatch &&
FcPatternGetString(match, FC_STYLE, 0, &fcStyle) == FcResultMatch &&
FcPatternGetString(match, FC_FILE, 0, &fcFile) == FcResultMatch)
for (int i = 0; i < matches->nfont; i++)
{
record.family_ = reinterpret_cast<char*>(fcFamily);
record.style_ = reinterpret_cast<char*>(fcStyle);
record.filename_ = reinterpret_cast<char*>(fcFile);
FcPattern* match =
// Using C code requires pointer arithmetic
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
FcFontRenderPrepare(nullptr, pattern, matches->fonts[i]);
if (match == nullptr)
{
continue;
}
FcChar8* fcFamily = nullptr;
FcChar8* fcStyle = nullptr;
FcChar8* fcFile = nullptr;
FcBool fcSymbol = FcFalse;
logger_->debug("Found matching font: {}:{} ({})",
record.family_,
record.style_,
record.filename_);
// Match was found, get properties
if (FcPatternGetString(match, FC_FAMILY, 0, &fcFamily) ==
FcResultMatch &&
FcPatternGetString(match, FC_STYLE, 0, &fcStyle) ==
FcResultMatch &&
FcPatternGetString(match, FC_FILE, 0, &fcFile) == FcResultMatch &&
FcPatternGetBool(match, FC_SYMBOL, 0, &fcSymbol) ==
FcResultMatch &&
fcSymbol == FcFalse /*Must check fcSymbol manually*/)
{
record.family_ = reinterpret_cast<char*>(fcFamily);
record.style_ = reinterpret_cast<char*>(fcStyle);
record.filename_ = reinterpret_cast<char*>(fcFile);
logger_->debug("Found matching font: {}:{} ({}) {}",
record.family_,
record.style_,
record.filename_,
fcSymbol);
FcPatternDestroy(match);
break;
}
FcPatternDestroy(match);
}
}
@ -517,7 +540,7 @@ FontManager::Impl::MatchFontFile(const std::string& family,
}
// Cleanup
FcPatternDestroy(match);
FcFontSetDestroy(matches);
FcPatternDestroy(pattern);
return record;

8
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -1619,6 +1619,14 @@ void MapWidgetImpl::ImGuiCheckFonts()
ImGui_ImplOpenGL3_CreateFontsTexture();
}
static bool haveLogged = false;
if (!model::ImGuiContextModel::Instance().font_atlas()->IsBuilt() &&
!haveLogged)
{
logger_->error("ImGui font atlas could not be built.");
haveLogged = true;
}
imGuiFontsBuildCount_ = currentImGuiFontsBuildCount;
}