i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app_server: Switch default UI font to Noto Sans Display.

Browse Source 
Fixes #14779.
This commit is contained in:
Augustin Cavalier
2019-01-09 20:35:41 -05:00
parent 5464abed7e
commit 177db1e47f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerConfig.h
+2 -2
View File
@@ -27,11 +27,11 @@
// These definitions provide the server something to use for default // These definitions provide the server something to use for default
// system fonts. // 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 FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT"
#define DEFAULT_PLAIN_FONT_STYLE "Book" #define DEFAULT_PLAIN_FONT_STYLE "Book"
#define DEFAULT_PLAIN_FONT_SIZE 12.0f #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 FALLBACK_BOLD_FONT_FAMILY "Swis721 BT"
#define DEFAULT_BOLD_FONT_STYLE "Bold" #define DEFAULT_BOLD_FONT_STYLE "Bold"
#define DEFAULT_BOLD_FONT_SIZE 12.0f #define DEFAULT_BOLD_FONT_SIZE 12.0f
src/servers/app/font/FontManager.cpp
+4 -4
View File
@@ -334,12 +334,12 @@ FontManager::_LoadRecentFontMappings()
ttfontsPath.Append("ttfonts"); ttfontsPath.Append("ttfonts");
BPath veraFontPath = ttfontsPath; BPath veraFontPath = ttfontsPath;
veraFontPath.Append("NotoSans-Regular.ttf"); veraFontPath.Append("NotoSansDisplay-Regular.ttf");
_AddDefaultMapping("Noto Sans", "Book", veraFontPath.Path()); _AddDefaultMapping("Noto Sans Display", "Book", veraFontPath.Path());
veraFontPath.SetTo(ttfontsPath.Path()); veraFontPath.SetTo(ttfontsPath.Path());
veraFontPath.Append("NotoSans-Bold.ttf"); veraFontPath.Append("NotoSansDisplay-Bold.ttf");
_AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path()); _AddDefaultMapping("Noto Sans Display", "Bold", veraFontPath.Path());
veraFontPath.SetTo(ttfontsPath.Path()); veraFontPath.SetTo(ttfontsPath.Path());
veraFontPath.Append("NotoMono-Regular.ttf"); veraFontPath.Append("NotoMono-Regular.ttf");
src/servers/app/font/GlyphLayoutEngine.h
+1 -1
View File
@@ -324,7 +324,7 @@ GlyphLayoutEngine::_WriteLockAndAcquireFallbackEntry(
// and b) be similar to the original font. So there should be a mapping // and b) be similar to the original font. So there should be a mapping
// of some kind to know the most suitable fallback font. // of some kind to know the most suitable fallback font.
static const char* fallbacks[] = { static const char* fallbacks[] = {
"Noto Sans", "Noto Sans Display",
"Noto Sans CJK JP", "Noto Sans CJK JP",
"Noto Sans Symbols", "Noto Sans Symbols",
NULL NULL