Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <no-reply+buildbot@haiku-os.org>
Haiku-Format: Haiku-format Bot <no-reply+haikuformatbot@haiku-os.org>
Reviewed-by: Fredrik Holmqvist <fredrik.holmqvist@gmail.com>
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
Reviewed-by: nephele nephele <nep-git@packageloss.eu>
This commit is contained in:
Jérôme Duval 2024-02-10 15:01:51 +01:00 committed by Adrien Destugues
parent 0f792e577c
commit 4d6b8a5796
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/servers/app/ServerConfig.h
View File

@ -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"

8
src/servers/app/font/GlobalFontManager.cpp
View File

@ -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");

2
src/servers/app/font/GlyphLayoutEngine.h
View File

@ -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",