From 8e2cd40d9ec4b565e9ffe3352f7be2dca79aade2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= Date: Wed, 18 Jan 2023 16:20:23 +0100 Subject: [PATCH] FontManager: use correct constants for default styles Reapply part of 12ae5308f2 that was lost in the long revision history of user fonts. No big deal as the values are the same. Change-Id: I26bbceb0380b33e35b105519a11e309500f9acf6 Reviewed-on: https://review.haiku-os.org/c/haiku/+/6006 Tested-by: Commit checker robot Reviewed-by: waddlesplash --- src/servers/app/font/GlobalFontManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/servers/app/font/GlobalFontManager.cpp b/src/servers/app/font/GlobalFontManager.cpp index fd9842e14d..fb2a880962 100644 --- a/src/servers/app/font/GlobalFontManager.cpp +++ b/src/servers/app/font/GlobalFontManager.cpp @@ -436,11 +436,11 @@ GlobalFontManager::_GetDefaultStyle(const char* familyName, const char* styleNam status_t GlobalFontManager::_SetDefaultFonts() { + FontStyle* style = NULL; + // plain font - FontStyle* style = _GetDefaultStyle(DEFAULT_PLAIN_FONT_FAMILY, - DEFAULT_PLAIN_FONT_STYLE, FALLBACK_PLAIN_FONT_FAMILY, - DEFAULT_PLAIN_FONT_STYLE, - B_REGULAR_FACE); + style = _GetDefaultStyle(DEFAULT_PLAIN_FONT_FAMILY, DEFAULT_PLAIN_FONT_STYLE, + FALLBACK_PLAIN_FONT_FAMILY, FALLBACK_PLAIN_FONT_STYLE, B_REGULAR_FACE); if (style == NULL) return B_ERROR; @@ -451,7 +451,7 @@ GlobalFontManager::_SetDefaultFonts() // bold font style = _GetDefaultStyle(DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE, - FALLBACK_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE, B_BOLD_FACE); + FALLBACK_BOLD_FONT_FAMILY, FALLBACK_BOLD_FONT_STYLE, B_BOLD_FACE); fDefaultBoldFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE)); @@ -460,7 +460,7 @@ GlobalFontManager::_SetDefaultFonts() // fixed font 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, FALLBACK_FIXED_FONT_STYLE, B_REGULAR_FACE); fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style, DEFAULT_FONT_SIZE));