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

app_server: Clean up default font size constants.

Browse Source
This commit is contained in:
Augustin Cavalier
2022-09-30 20:53:44 -04:00
parent cde5ffa802
commit 872ce8a1b4
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerConfig.h
+2 -6
View File
@@ -27,29 +27,25 @@
// 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_FONT_SIZE 12.0f
#define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans Display" #define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans Display"
#define DEFAULT_PLAIN_FONT_STYLE "Regular" #define DEFAULT_PLAIN_FONT_STYLE "Regular"
#define DEFAULT_PLAIN_FONT_SIZE 12.0f
#define FALLBACK_PLAIN_FONT_FAMILY "Noto Sans Thai" #define FALLBACK_PLAIN_FONT_FAMILY "Noto Sans Thai"
#define FALLBACK_PLAIN_FONT_STYLE "Regular" #define FALLBACK_PLAIN_FONT_STYLE "Regular"
#define FALLBACK_PLAIN_FONT_SIZE 12.0f
#define DEFAULT_BOLD_FONT_FAMILY "Noto Sans Display" #define DEFAULT_BOLD_FONT_FAMILY "Noto Sans Display"
#define DEFAULT_BOLD_FONT_STYLE "Bold" #define DEFAULT_BOLD_FONT_STYLE "Bold"
#define DEFAULT_BOLD_FONT_SIZE 12.0f
#define FALLBACK_BOLD_FONT_FAMILY "Noto Sans Thai" #define FALLBACK_BOLD_FONT_FAMILY "Noto Sans Thai"
#define FALLBACK_BOLD_FONT_STYLE "Bold" #define FALLBACK_BOLD_FONT_STYLE "Bold"
#define FALLBACK_BOLD_FONT_SIZE 12.0f
#define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono" #define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono"
#define DEFAULT_FIXED_FONT_STYLE "Regular" #define DEFAULT_FIXED_FONT_STYLE "Regular"
#define DEFAULT_FIXED_FONT_SIZE 12.0f
#define FALLBACK_FIXED_FONT_FAMILY "Noto Sans Thai" #define FALLBACK_FIXED_FONT_FAMILY "Noto Sans Thai"
#define FALLBACK_FIXED_FONT_STYLE "Regular" #define FALLBACK_FIXED_FONT_STYLE "Regular"
#define FALLBACK_FIXED_FONT_SIZE 12.0f
// This is the port capacity for all monitoring objects - ServerApps // This is the port capacity for all monitoring objects - ServerApps
// and ServerWindows // and ServerWindows
src/servers/app/font/FontManager.cpp
+3 -6
View File
@@ -472,8 +472,7 @@ FontManager::_SetDefaultFonts()
if (style == NULL) if (style == NULL)
return B_ERROR; return B_ERROR;
fDefaultPlainFont.SetTo(new (std::nothrow) ServerFont(*style, fDefaultPlainFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE));
DEFAULT_PLAIN_FONT_SIZE));
if (!fDefaultPlainFont.IsSet()) if (!fDefaultPlainFont.IsSet())
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -481,8 +480,7 @@ FontManager::_SetDefaultFonts()
style = _GetDefaultStyle(DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE, style = _GetDefaultStyle(DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE,
FALLBACK_BOLD_FONT_FAMILY, FALLBACK_BOLD_FONT_STYLE, B_BOLD_FACE); FALLBACK_BOLD_FONT_FAMILY, FALLBACK_BOLD_FONT_STYLE, B_BOLD_FACE);
fDefaultBoldFont.SetTo(new (std::nothrow) ServerFont(*style, fDefaultBoldFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE));
DEFAULT_BOLD_FONT_SIZE));
if (!fDefaultBoldFont.IsSet()) if (!fDefaultBoldFont.IsSet())
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -490,8 +488,7 @@ FontManager::_SetDefaultFonts()
style = _GetDefaultStyle(DEFAULT_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE, style = _GetDefaultStyle(DEFAULT_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE,
FALLBACK_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE, B_REGULAR_FACE); FALLBACK_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE, B_REGULAR_FACE);
fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style, fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE));
DEFAULT_FIXED_FONT_SIZE));
if (!fDefaultFixedFont.IsSet()) if (!fDefaultFixedFont.IsSet())
return B_NO_MEMORY; return B_NO_MEMORY;