diff --git a/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp b/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp index 614e728d..73710155 100644 --- a/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp +++ b/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp @@ -179,10 +179,10 @@ static bool FontBuilder_Build(ImFontAtlas* atlas) auto font = msdfgen::loadFontData(freeType, reinterpret_cast(config.FontData), config.FontDataSize); msdf_atlas::FontGeometry fontGeometry(&glyphs); - fontGeometry.loadCharset(font, 1.0, charset); + fontGeometry.loadCharset(font, config.SizePixels, charset); auto& metrics = fontGeometry.getMetrics(); - config.DstFont->FontSize = 1.0f; + config.DstFont->FontSize = config.SizePixels; config.DstFont->ConfigData = &config; config.DstFont->ConfigDataCount = 1; config.DstFont->ContainerAtlas = atlas; @@ -203,7 +203,6 @@ static bool FontBuilder_Build(ImFontAtlas* atlas) TightAtlasPacker packer; packer.spacing = 1; packer.dimensionsConstraint = msdf_atlas::DimensionsConstraint::POWER_OF_TWO_RECTANGLE; - packer.minScale = 24.0; packer.miterLimit = 1.0; packer.pxRange = 8.0; packer.pack(glyphs.data(), glyphs.size(), customRects.data(), customRects.size()); diff --git a/UnleashedRecomp/gpu/imgui/imgui_snapshot.cpp b/UnleashedRecomp/gpu/imgui/imgui_snapshot.cpp index 6d12a21e..dbf87eee 100644 --- a/UnleashedRecomp/gpu/imgui/imgui_snapshot.cpp +++ b/UnleashedRecomp/gpu/imgui/imgui_snapshot.cpp @@ -265,5 +265,5 @@ ImFont* ImFontAtlasSnapshot::GetFont(const char* name) assert(false && "Unable to locate equivalent font in the atlas file."); #endif - return fontAtlas->AddFontFromFileTTF(name, 1.0f, nullptr, g_glyphRanges.data()); + return fontAtlas->AddFontFromFileTTF(name, 24.0f, nullptr, g_glyphRanges.data()); } diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp index 0f883646..af102859 100644 --- a/UnleashedRecomp/gpu/video.cpp +++ b/UnleashedRecomp/gpu/video.cpp @@ -1124,6 +1124,7 @@ static void CreateImGuiBackend() IM_DELETE(io.Fonts); io.Fonts = ImFontAtlasSnapshot::Load(); #else + io.Fonts->AddFontDefault(); ImFontAtlasSnapshot::GenerateGlyphRanges(); #endif