From c8d81e318785cae45d5b87c90c43ba63ee21d924 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Tue, 4 Feb 2025 22:59:31 +0100 Subject: [PATCH] fix font resolution when not explicitly adding regular --- openVulkanoCpp/Host/Linux/SystemFontResolver.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openVulkanoCpp/Host/Linux/SystemFontResolver.cpp b/openVulkanoCpp/Host/Linux/SystemFontResolver.cpp index 43bb6d4..1d09aa5 100644 --- a/openVulkanoCpp/Host/Linux/SystemFontResolver.cpp +++ b/openVulkanoCpp/Host/Linux/SystemFontResolver.cpp @@ -17,8 +17,12 @@ namespace OpenVulkano // fontName -> fontPath static std::map fontFilesMapping = ReadSystemFonts(); static std::string fallbackString; - auto it = fontFilesMapping.find(Utils::ToLower(fontName)); - return it == fontFilesMapping.end() ? fallbackString : it->second; + std::string fontNameLower = Utils::ToLower(fontName); + auto it = fontFilesMapping.find(fontNameLower); + if (it != fontFilesMapping.end()) return it->second; + it = fontFilesMapping.find(fontNameLower + " regular"); + if (it != fontFilesMapping.end()) return it->second; + return fallbackString; } std::map SystemFontResolver::ReadSystemFonts()