From 177db1e47fe26cd74d606a79065a5fbdd1f50097 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 9 Jan 2019 20:35:41 -0500 Subject: [PATCH] app_server: Switch default UI font to Noto Sans Display. Fixes #14779. --- src/servers/app/ServerConfig.h | 4 ++-- src/servers/app/font/FontManager.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 6416516848..6d1dd65d99 100644 --- a/src/servers/app/ServerConfig.h +++ b/src/servers/app/ServerConfig.h @@ -27,11 +27,11 @@ // These definitions provide the server something to use for default // system fonts. -#define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans" +#define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans Display" #define FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT" #define DEFAULT_PLAIN_FONT_STYLE "Book" #define DEFAULT_PLAIN_FONT_SIZE 12.0f -#define DEFAULT_BOLD_FONT_FAMILY "Noto Sans" +#define DEFAULT_BOLD_FONT_FAMILY "Noto Sans Display" #define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT" #define DEFAULT_BOLD_FONT_STYLE "Bold" #define DEFAULT_BOLD_FONT_SIZE 12.0f diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp index 088b23f81c..7c3a2b30a8 100644 --- a/src/servers/app/font/FontManager.cpp +++ b/src/servers/app/font/FontManager.cpp @@ -334,12 +334,12 @@ FontManager::_LoadRecentFontMappings() ttfontsPath.Append("ttfonts"); BPath veraFontPath = ttfontsPath; - veraFontPath.Append("NotoSans-Regular.ttf"); - _AddDefaultMapping("Noto Sans", "Book", veraFontPath.Path()); + veraFontPath.Append("NotoSansDisplay-Regular.ttf"); + _AddDefaultMapping("Noto Sans Display", "Book", veraFontPath.Path()); veraFontPath.SetTo(ttfontsPath.Path()); - veraFontPath.Append("NotoSans-Bold.ttf"); - _AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path()); + veraFontPath.Append("NotoSansDisplay-Bold.ttf"); + _AddDefaultMapping("Noto Sans Display", "Bold", veraFontPath.Path()); veraFontPath.SetTo(ttfontsPath.Path()); veraFontPath.Append("NotoMono-Regular.ttf"); diff --git a/src/servers/app/font/GlyphLayoutEngine.h b/src/servers/app/font/GlyphLayoutEngine.h index c3c666c3b3..71d026cb3e 100644 --- a/src/servers/app/font/GlyphLayoutEngine.h +++ b/src/servers/app/font/GlyphLayoutEngine.h @@ -324,7 +324,7 @@ GlyphLayoutEngine::_WriteLockAndAcquireFallbackEntry( // 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", + "Noto Sans Display", "Noto Sans CJK JP", "Noto Sans Symbols", NULL