From 4d6b8a5796f0aabc3fe809e55ebdd397d18bc251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 10 Feb 2024 15:01:51 +0100 Subject: [PATCH] app_server: Switch default UI font to Noto Sans. fixes #18793 Change-Id: If53229acd6c00e1a800c6808f3f0261ae59d99bb Reviewed-on: https://review.haiku-os.org/c/haiku/+/7400 Tested-by: Commit checker robot Haiku-Format: Haiku-format Bot Reviewed-by: Fredrik Holmqvist Reviewed-by: Adrien Destugues Reviewed-by: nephele nephele --- src/servers/app/ServerConfig.h | 4 ++-- src/servers/app/font/GlobalFontManager.cpp | 8 ++++---- src/servers/app/font/GlyphLayoutEngine.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h index d25b28a60b..83f7fa0eeb 100644 --- a/src/servers/app/ServerConfig.h +++ b/src/servers/app/ServerConfig.h @@ -29,13 +29,13 @@ // system fonts. #define DEFAULT_FONT_SIZE 12.0f -#define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans Display" +#define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans" #define DEFAULT_PLAIN_FONT_STYLE "Regular" #define FALLBACK_PLAIN_FONT_FAMILY "Noto Sans Thai" #define FALLBACK_PLAIN_FONT_STYLE "Regular" -#define DEFAULT_BOLD_FONT_FAMILY "Noto Sans Display" +#define DEFAULT_BOLD_FONT_FAMILY "Noto Sans" #define DEFAULT_BOLD_FONT_STYLE "Bold" #define FALLBACK_BOLD_FONT_FAMILY "Noto Sans Thai" diff --git a/src/servers/app/font/GlobalFontManager.cpp b/src/servers/app/font/GlobalFontManager.cpp index 6c1d540f5a..922eb48abd 100644 --- a/src/servers/app/font/GlobalFontManager.cpp +++ b/src/servers/app/font/GlobalFontManager.cpp @@ -353,12 +353,12 @@ GlobalFontManager::_LoadRecentFontMappings() ttfontsPath.Append("ttfonts"); BPath veraFontPath = ttfontsPath; - veraFontPath.Append("NotoSansDisplay-Regular.ttf"); - _AddDefaultMapping("Noto Sans Display", "Book", veraFontPath.Path()); + veraFontPath.Append("NotoSans-Regular.ttf"); + _AddDefaultMapping("Noto Sans", "Book", veraFontPath.Path()); veraFontPath.SetTo(ttfontsPath.Path()); - veraFontPath.Append("NotoSansDisplay-Bold.ttf"); - _AddDefaultMapping("Noto Sans Display", "Bold", veraFontPath.Path()); + veraFontPath.Append("NotoSans-Bold.ttf"); + _AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path()); veraFontPath.SetTo(ttfontsPath.Path()); veraFontPath.Append("NotoSansMono-Regular.ttf"); diff --git a/src/servers/app/font/GlyphLayoutEngine.h b/src/servers/app/font/GlyphLayoutEngine.h index 563efbfbbd..b2bf03e895 100644 --- a/src/servers/app/font/GlyphLayoutEngine.h +++ b/src/servers/app/font/GlyphLayoutEngine.h @@ -416,7 +416,7 @@ GlyphLayoutEngine::PopulateFallbacks( // and b) be similar to the original font. So there should be a mapping // of some kind to know the most suitable fallback font. static const char* fallbacks[] = { - "Noto Sans Display", + "Noto Sans", "Noto Sans Thai", "Noto Sans CJK JP", "Noto Sans Cherokee",