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

fall back fonts are actually used now if you didn't install the Vera fonts on R5

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12387 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-04-14 00:11:33 +00:00
parent d3665bb866
commit bd841e3cd4
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/AppServer.cpp
+25 -22
View File
@@ -113,38 +113,41 @@ AppServer::AppServer(void)
// fontserver->ScanDirectory("/boot/home/config/fonts/psfonts/"); // fontserver->ScanDirectory("/boot/home/config/fonts/psfonts/");
fontserver->SaveList(); fontserver->SaveList();
if(!fontserver->SetSystemPlain(DEFAULT_PLAIN_FONT_FAMILY, if (!fontserver->SetSystemPlain(DEFAULT_PLAIN_FONT_FAMILY,
DEFAULT_PLAIN_FONT_STYLE, DEFAULT_PLAIN_FONT_STYLE,
DEFAULT_PLAIN_FONT_SIZE) || DEFAULT_PLAIN_FONT_SIZE) &&
!fontserver->SetSystemPlain(FALLBACK_PLAIN_FONT_FAMILY, !fontserver->SetSystemPlain(FALLBACK_PLAIN_FONT_FAMILY,
DEFAULT_PLAIN_FONT_STYLE, DEFAULT_PLAIN_FONT_STYLE,
DEFAULT_PLAIN_FONT_SIZE)) { DEFAULT_PLAIN_FONT_SIZE)) {
printf("Couldn't set plain to %s, %s %d pt\n", printf("Couldn't set plain to %s (fallback: %s), %s %d pt\n",
DEFAULT_PLAIN_FONT_FAMILY, DEFAULT_PLAIN_FONT_FAMILY,
FALLBACK_PLAIN_FONT_FAMILY,
DEFAULT_PLAIN_FONT_STYLE, DEFAULT_PLAIN_FONT_STYLE,
DEFAULT_PLAIN_FONT_SIZE); DEFAULT_PLAIN_FONT_SIZE);
} }
if(!fontserver->SetSystemBold(DEFAULT_BOLD_FONT_FAMILY, if (!fontserver->SetSystemBold(DEFAULT_BOLD_FONT_FAMILY,
DEFAULT_BOLD_FONT_STYLE, DEFAULT_BOLD_FONT_STYLE,
DEFAULT_BOLD_FONT_SIZE) || DEFAULT_BOLD_FONT_SIZE) &&
!fontserver->SetSystemBold(FALLBACK_BOLD_FONT_FAMILY, !fontserver->SetSystemBold(FALLBACK_BOLD_FONT_FAMILY,
DEFAULT_BOLD_FONT_STYLE, DEFAULT_BOLD_FONT_STYLE,
DEFAULT_BOLD_FONT_SIZE)) { DEFAULT_BOLD_FONT_SIZE)) {
printf("Couldn't set bold to %s, %s %d pt\n", printf("Couldn't set bold to %s (fallback: %s), %s %d pt\n",
DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_FAMILY,
FALLBACK_BOLD_FONT_FAMILY,
DEFAULT_BOLD_FONT_STYLE, DEFAULT_BOLD_FONT_STYLE,
DEFAULT_BOLD_FONT_SIZE); DEFAULT_BOLD_FONT_SIZE);
} }
if(!fontserver->SetSystemFixed(DEFAULT_FIXED_FONT_FAMILY, if (!fontserver->SetSystemFixed(DEFAULT_FIXED_FONT_FAMILY,
DEFAULT_FIXED_FONT_STYLE, DEFAULT_FIXED_FONT_STYLE,
DEFAULT_FIXED_FONT_SIZE) || DEFAULT_FIXED_FONT_SIZE) &&
!fontserver->SetSystemFixed(FALLBACK_FIXED_FONT_FAMILY, !fontserver->SetSystemFixed(FALLBACK_FIXED_FONT_FAMILY,
DEFAULT_FIXED_FONT_STYLE, DEFAULT_FIXED_FONT_STYLE,
DEFAULT_FIXED_FONT_SIZE)) { DEFAULT_FIXED_FONT_SIZE)) {
printf("Couldn't set fixed to %s, %s %d pt\n", printf("Couldn't set fixed to %s (fallback: %s), %s %d pt\n",
DEFAULT_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_FAMILY,
FALLBACK_FIXED_FONT_FAMILY,
DEFAULT_FIXED_FONT_STYLE, DEFAULT_FIXED_FONT_STYLE,
DEFAULT_FIXED_FONT_SIZE); DEFAULT_FIXED_FONT_SIZE);
} }
@@ -645,7 +648,7 @@ void AppServer::DispatchMessage(int32 code, BPortLink &msg)
} }
case B_QUIT_REQUESTED: case B_QUIT_REQUESTED:
{ {
#if DISPLAYDRIVER != HWDRIVER #if TEST_MODE
// Attached Data: // Attached Data:
// none // none