From 872ce8a1b4e31cd201c62a0ea6c685631ecb93cf Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 30 Sep 2022 20:53:44 -0400 Subject: [PATCH] app_server: Clean up default font size constants. --- src/servers/app/ServerConfig.h | 8 ++------ src/servers/app/font/FontManager.cpp | 9 +++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h index dde87dd458..d25b28a60b 100644 --- a/src/servers/app/ServerConfig.h +++ b/src/servers/app/ServerConfig.h @@ -27,29 +27,25 @@ // These definitions provide the server something to use for default // system fonts. +#define DEFAULT_FONT_SIZE 12.0f + #define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans Display" #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_STYLE "Regular" -#define FALLBACK_PLAIN_FONT_SIZE 12.0f #define DEFAULT_BOLD_FONT_FAMILY "Noto Sans Display" #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_STYLE "Bold" -#define FALLBACK_BOLD_FONT_SIZE 12.0f #define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono" #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_STYLE "Regular" -#define FALLBACK_FIXED_FONT_SIZE 12.0f // This is the port capacity for all monitoring objects - ServerApps // and ServerWindows diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp index 92c2f476ae..a1f2561ebd 100644 --- a/src/servers/app/font/FontManager.cpp +++ b/src/servers/app/font/FontManager.cpp @@ -472,8 +472,7 @@ FontManager::_SetDefaultFonts() if (style == NULL) return B_ERROR; - fDefaultPlainFont.SetTo(new (std::nothrow) ServerFont(*style, - DEFAULT_PLAIN_FONT_SIZE)); + fDefaultPlainFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE)); if (!fDefaultPlainFont.IsSet()) return B_NO_MEMORY; @@ -481,8 +480,7 @@ FontManager::_SetDefaultFonts() style = _GetDefaultStyle(DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE, FALLBACK_BOLD_FONT_FAMILY, FALLBACK_BOLD_FONT_STYLE, B_BOLD_FACE); - fDefaultBoldFont.SetTo(new (std::nothrow) ServerFont(*style, - DEFAULT_BOLD_FONT_SIZE)); + fDefaultBoldFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE)); if (!fDefaultBoldFont.IsSet()) return B_NO_MEMORY; @@ -490,8 +488,7 @@ FontManager::_SetDefaultFonts() style = _GetDefaultStyle(DEFAULT_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE, FALLBACK_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE, B_REGULAR_FACE); - fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style, - DEFAULT_FIXED_FONT_SIZE)); + fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE)); if (!fDefaultFixedFont.IsSet()) return B_NO_MEMORY;