From 35353d41bb0e3a395c5473be6a0486119ecb6b33 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sat, 25 Nov 2017 20:41:07 +0100
Subject: [PATCH] Switch default fixed font from NotoMono to NotoSansMono
---
docs/interface_guidelines/haiku.css | 2 +-
src/kits/network/libnetapi/GopherRequest.cpp | 2 +-
src/servers/app/ServerConfig.h | 2 +-
src/servers/app/font/FontManager.cpp | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/interface_guidelines/haiku.css b/docs/interface_guidelines/haiku.css
index cdd108d..ed5c6a9 100644
a
|
b
|
|
12 | 12 | } |
13 | 13 | cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym, |
14 | 14 | literal, option, parameter, sgmltag, systemitem { |
15 | | font-family: "Noto Mono", Courier, "Courier New", monospace, fixed; |
| 15 | font-family: "Noto Sans Mono", Courier, "Courier New", monospace, fixed; |
16 | 16 | } |
17 | 17 | term { |
18 | 18 | font-weight: bold; |
diff --git a/src/kits/network/libnetapi/GopherRequest.cpp b/src/kits/network/libnetapi/GopherRequest.cpp
index 8b4bf68..1612227 100644
a
|
b
|
static const char *kStyleSheet = "\n"
|
143 | 143 | "body#gopher span {\n" |
144 | 144 | " margin-left: 1em;\n" |
145 | 145 | " padding-left: 2em;\n" |
146 | | " font-family: 'Noto Mono', Courier, monospace;\n" |
| 146 | " font-family: 'Noto Sans Mono', Courier, monospace;\n" |
147 | 147 | " word-wrap: break-word;\n" |
148 | 148 | " white-space: pre-wrap; }\n" |
149 | 149 | "\n" |
diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h
index 6416516..51427c5 100644
a
|
b
|
|
35 | 35 | #define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT" |
36 | 36 | #define DEFAULT_BOLD_FONT_STYLE "Bold" |
37 | 37 | #define DEFAULT_BOLD_FONT_SIZE 12.0f |
38 | | #define DEFAULT_FIXED_FONT_FAMILY "Noto Mono" |
| 38 | #define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono" |
39 | 39 | #define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT" |
40 | 40 | #define DEFAULT_FIXED_FONT_STYLE "Regular" |
41 | 41 | #define DEFAULT_FIXED_FONT_SIZE 12.0f |
diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp
index 088b23f..e6dc920 100644
a
|
b
|
FontManager::_LoadRecentFontMappings()
|
342 | 342 | _AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path()); |
343 | 343 | |
344 | 344 | veraFontPath.SetTo(ttfontsPath.Path()); |
345 | | veraFontPath.Append("NotoMono-Regular.ttf"); |
346 | | _AddDefaultMapping("Noto Mono", "Regular", veraFontPath.Path()); |
| 345 | veraFontPath.Append("NotoSansMono-Regular.ttf"); |
| 346 | _AddDefaultMapping("Noto Sans Mono", "Regular", veraFontPath.Path()); |
347 | 347 | |
348 | 348 | return true; |
349 | 349 | } |