Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-18 00:56:49 +01:00
Code Releases Wiki Activity

fix: Various font loading issues

Browse Source
This commit is contained in:
WerWolv 2023-11-28 09:49:38 +01:00
parent c02c27b63d
commit 813a95d283
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/gui/source/init/tasks.cpp
View File

@ -86,6 +86,7 @@ namespace hex::init {
ImHexApi::System::getAdditionalFolderPaths().clear();
ImHexApi::System::getCustomFontPath().clear();
ImHexApi::Messaging::impl::getHandlers().clear();
ImHexApi::Fonts::impl::getFonts().clear();
ContentRegistry::Settings::impl::getSettings().clear();
ContentRegistry::Settings::impl::getSettingsData().clear();

3
main/gui/source/window/window.cpp
View File

@ -1162,9 +1162,6 @@ namespace hex {
io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
}
for (auto &entry : fonts->ConfigData)
io.Fonts->ConfigData.push_back(entry);
io.ConfigViewportsNoTaskBarIcon = false;
ImNodes::PushAttributeFlag(ImNodesAttributeFlags_EnableLinkDetachWithDragClick);

13
plugins/builtin/source/content/init_tasks.cpp
View File

@ -13,10 +13,6 @@
#include <imgui.h>
#include <imgui_freetype.h>
#include <fonts/codicons_font.h>
#include <fonts/fontawesome_font.h>
#include <fonts/unifont_font.h>
namespace hex::plugin::builtin {
namespace {
@ -107,13 +103,13 @@ namespace hex::plugin::builtin {
}
bool configureUIScale() {
int interfaceScaleSetting = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.scaling", 0.0F).get<float>() * 10;
int interfaceScaleSetting = int(ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.scaling", 0.0F).get<float>() * 10.0F);
float interfaceScaling;
if (interfaceScaleSetting == 0)
interfaceScaling = ImHexApi::System::getNativeScale();
else
interfaceScaling = interfaceScaleSetting / 10.0F;
interfaceScaling = int(interfaceScaleSetting / 10.0F);
ImHexApi::System::impl::setGlobalScale(interfaceScaling);
@ -153,7 +149,7 @@ namespace hex::plugin::builtin {
// If a custom font has been loaded now, also load the font size
float fontSize = defaultFontSize;
if (!fontFile.empty()) {
fontSize = ContentRegistry::Settings::read("hex.builtin.setting.font", "hex.builtin.setting.font.font_size", 13).get<int>() * ImHexApi::System::getGlobalScale();
fontSize = float(ContentRegistry::Settings::read("hex.builtin.setting.font", "hex.builtin.setting.font.font_size", 13).get<int>()) * ImHexApi::System::getGlobalScale();
}
ImHexApi::System::impl::setFontSize(fontSize);
@ -174,6 +170,7 @@ namespace hex::plugin::builtin {
// Configure font glyph ranges that should be loaded from the default font and unifont
static ImVector<ImWchar> defaultGlyphRanges;
defaultGlyphRanges = { };
{
ImFontGlyphRangesBuilder glyphRangesBuilder;
@ -250,7 +247,7 @@ namespace hex::plugin::builtin {
std::strncpy(cfg.Name, font.name.c_str(), sizeof(cfg.Name));
cfg.GlyphOffset = { font.offset.x, font.offset.y };
fonts->AddFontFromMemoryTTF(font.fontData.data(), font.fontData.size(), 0, &cfg, ranges.back().Data);
fonts->AddFontFromMemoryTTF(font.fontData.data(), int(font.fontData.size()), 0, &cfg, ranges.back().Data);
}
// Try to build the font atlas