Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FontManager: use correct constants for default styles

Browse Source 
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 <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Máximo Castañeda 2023-01-18 16:20:23 +01:00 committed by waddlesplash
parent 4cff9918f3
commit 8e2cd40d9e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/servers/app/font/GlobalFontManager.cpp
View File

@ -436,11 +436,11 @@ GlobalFontManager::_GetDefaultStyle(const char* familyName, const char* styleNam
status_t status_t
GlobalFontManager::_SetDefaultFonts() GlobalFontManager::_SetDefaultFonts()
{ {
FontStyle* style = NULL;
// plain font // plain font
FontStyle* style = _GetDefaultStyle(DEFAULT_PLAIN_FONT_FAMILY, style = _GetDefaultStyle(DEFAULT_PLAIN_FONT_FAMILY, DEFAULT_PLAIN_FONT_STYLE,
DEFAULT_PLAIN_FONT_STYLE, FALLBACK_PLAIN_FONT_FAMILY, FALLBACK_PLAIN_FONT_FAMILY, FALLBACK_PLAIN_FONT_STYLE, B_REGULAR_FACE);
DEFAULT_PLAIN_FONT_STYLE,
B_REGULAR_FACE);
if (style == NULL) if (style == NULL)
return B_ERROR; return B_ERROR;
@ -451,7 +451,7 @@ GlobalFontManager::_SetDefaultFonts()
// bold font // bold font
style = _GetDefaultStyle(DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE, 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, fDefaultBoldFont.SetTo(new (std::nothrow) ServerFont(*style,
DEFAULT_FONT_SIZE)); DEFAULT_FONT_SIZE));
@ -460,7 +460,7 @@ GlobalFontManager::_SetDefaultFonts()
// fixed font // fixed font
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, FALLBACK_FIXED_FONT_STYLE, B_REGULAR_FACE);
fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style, fDefaultFixedFont.SetTo(new (std::nothrow) ServerFont(*style,
DEFAULT_FONT_SIZE)); DEFAULT_FONT_SIZE));