From 7490bd32f1ae7a3faa0ccf65e0508c6d85a8ffd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 4 Nov 2005 09:49:25 +0000 Subject: [PATCH] Now also uses the fallback family when the usual default font couldn't be found. This hides a problem with the view states that the next commit will fix :) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14674 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/FontManager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/servers/app/FontManager.cpp b/src/servers/app/FontManager.cpp index db9785345d..5b12306ace 100644 --- a/src/servers/app/FontManager.cpp +++ b/src/servers/app/FontManager.cpp @@ -120,9 +120,12 @@ FontManager::_SetDefaultFont() { FontStyle* style = GetStyle(DEFAULT_PLAIN_FONT_FAMILY, DEFAULT_PLAIN_FONT_STYLE); if (style == NULL) { - style = FindStyleMatchingFace(B_REGULAR_FACE); - if (style == NULL) - style = FamilyAt(0)->StyleAt(0); + style = GetStyle(FALLBACK_PLAIN_FONT_FAMILY, DEFAULT_PLAIN_FONT_STYLE); + if (style == NULL) { + style = FindStyleMatchingFace(B_REGULAR_FACE); + if (style == NULL) + style = FamilyAt(0)->StyleAt(0); + } } fDefaultFont = new ServerFont(*style, DEFAULT_PLAIN_FONT_SIZE);