Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Crash on exit when using custom font from file (#1815) 

### Problem description
WerWolv/ImHex#1814

### Implementation description
1. Remove the flag that wrongly tells `ImFontAtlas` that it owns font
data, and remove that parameter from the function signature entirely
since now it is always `false`.
2. Rename `takeAtlas` to `getAtlas` since it no longer transfers
ownership as of b652565b57.
This commit is contained in:
Colin Snover 2024-07-15 15:22:02 -05:00 committed by GitHub
parent d7ed311bcf
commit fb249767f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/fonts/source/font_loader.cpp
View File

@ -75,11 +75,11 @@ namespace hex::fonts {
return Font(font); return Font(font);
} }
Font addFontFromMemory(const std::vector<u8> &fontData, float fontSize, bool scalable, ImVec2 offset, bool ownedByImGui = false, const ImVector<ImWchar> &glyphRange = {}) { Font addFontFromMemory(const std::vector<u8> &fontData, float fontSize, bool scalable, ImVec2 offset, const ImVector<ImWchar> &glyphRange = {}) {
auto &storedFontData = m_fontData.emplace_back(fontData); auto &storedFontData = m_fontData.emplace_back(fontData);
ImFontConfig config = m_config; ImFontConfig config = m_config;
config.FontDataOwnedByAtlas = ownedByImGui; config.FontDataOwnedByAtlas = false;
config.GlyphOffset = { offset.x, offset.y }; config.GlyphOffset = { offset.x, offset.y };
auto font = m_fontAtlas->AddFontFromMemoryTTF(storedFontData.data(), int(storedFontData.size()), fontSize, &config, !glyphRange.empty() ? glyphRange.Data : m_glyphRange.Data); auto font = m_fontAtlas->AddFontFromMemoryTTF(storedFontData.data(), int(storedFontData.size()), fontSize, &config, !glyphRange.empty() ? glyphRange.Data : m_glyphRange.Data);
@ -92,14 +92,14 @@ namespace hex::fonts {
Font addFontFromRomFs(const std::fs::path &path, float fontSize, bool scalable, ImVec2 offset, const ImVector<ImWchar> &glyphRange = {}) { Font addFontFromRomFs(const std::fs::path &path, float fontSize, bool scalable, ImVec2 offset, const ImVector<ImWchar> &glyphRange = {}) {
auto data = romfs::get(path).span<u8>(); auto data = romfs::get(path).span<u8>();
return addFontFromMemory({ data.begin(), data.end() }, fontSize, scalable, offset, false, glyphRange); return addFontFromMemory({ data.begin(), data.end() }, fontSize, scalable, offset, glyphRange);
} }
Font addFontFromFile(const std::fs::path &path, float fontSize, bool scalable, ImVec2 offset, const ImVector<ImWchar> &glyphRange = {}) { Font addFontFromFile(const std::fs::path &path, float fontSize, bool scalable, ImVec2 offset, const ImVector<ImWchar> &glyphRange = {}) {
wolv::io::File file(path, wolv::io::File::Mode::Read); wolv::io::File file(path, wolv::io::File::Mode::Read);
auto data = file.readVector(); auto data = file.readVector();
return addFontFromMemory(data, fontSize, scalable, offset, true, glyphRange); return addFontFromMemory(data, fontSize, scalable, offset, glyphRange);
} }
void setBold(bool enabled) { void setBold(bool enabled) {
@ -158,7 +158,7 @@ namespace hex::fonts {
return m_fontAtlas->Build(); return m_fontAtlas->Build();
} }
[[nodiscard]] ImFontAtlas* takeAtlas() { [[nodiscard]] ImFontAtlas* getAtlas() {
auto result = m_fontAtlas; auto result = m_fontAtlas;
return result; return result;
@ -351,7 +351,7 @@ namespace hex::fonts {
ImVec2 offset = { font.offset.x, font.offset.y - (defaultFont->getDescent() - fontAtlas.calculateFontDescend(font, fontSize)) }; ImVec2 offset = { font.offset.x, font.offset.y - (defaultFont->getDescent() - fontAtlas.calculateFontDescend(font, fontSize)) };
// Load the font // Load the font
fontAtlas.addFontFromMemory(font.fontData, font.defaultSize.value_or(fontSize), !font.defaultSize.has_value(), offset, false, glyphRanges.back()); fontAtlas.addFontFromMemory(font.fontData, font.defaultSize.value_or(fontSize), !font.defaultSize.has_value(), offset, glyphRanges.back());
} }
} }
@ -361,7 +361,7 @@ namespace hex::fonts {
if (fontAtlas.build()) { if (fontAtlas.build()) {
ImGui_ImplOpenGL3_DestroyFontsTexture(); ImGui_ImplOpenGL3_DestroyFontsTexture();
ImGui_ImplOpenGL3_CreateFontsTexture(); ImGui_ImplOpenGL3_CreateFontsTexture();
ImHexApi::Fonts::impl::setFontAtlas(fontAtlas.takeAtlas()); ImHexApi::Fonts::impl::setFontAtlas(fontAtlas.getAtlas());
} }
}); });
@ -369,7 +369,7 @@ namespace hex::fonts {
const bool result = fontAtlas.build(); const bool result = fontAtlas.build();
if (result) { if (result) {
// Set the font atlas if the build was successful // Set the font atlas if the build was successful
ImHexApi::Fonts::impl::setFontAtlas(fontAtlas.takeAtlas()); ImHexApi::Fonts::impl::setFontAtlas(fontAtlas.getAtlas());
return true; return true;
} }