From 2fe84ae95feccc80f29269a4b340693b3091ea00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 9 Nov 2005 19:22:21 +0000 Subject: [PATCH] Now AS_GET_DEFAULT_SYSTEM_FONT actually returns the default font as used by the app_server (ie. also if it's a fallback font). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14805 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/ServerApp.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp index 49dfd4b329..cc466e1b68 100644 --- a/src/servers/app/ServerApp.cpp +++ b/src/servers/app/ServerApp.cpp @@ -1147,26 +1147,17 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link) // input: // 1) string - font type ("plain", ...) - const char* family = NULL; - const char* style = NULL; - float size = 0; + ServerFont font; char type[B_OS_NAME_LENGTH]; status_t status = link.ReadString(type, sizeof(type)); if (status == B_OK) { if (!strcmp(type, "plain")) { - // TODO: we should return an *existing* font here... - family = DEFAULT_PLAIN_FONT_FAMILY; - style = DEFAULT_PLAIN_FONT_STYLE; - size = DEFAULT_PLAIN_FONT_SIZE; + font = *gFontManager->DefaultPlainFont(); } else if (!strcmp(type, "bold")) { - family = DEFAULT_BOLD_FONT_FAMILY; - style = DEFAULT_BOLD_FONT_STYLE; - size = DEFAULT_BOLD_FONT_SIZE; + font = *gFontManager->DefaultBoldFont(); } else if (!strcmp(type, "fixed")) { - family = DEFAULT_FIXED_FONT_FAMILY; - style = DEFAULT_FIXED_FONT_STYLE; - size = DEFAULT_FIXED_FONT_SIZE; + font = *gFontManager->DefaultFixedFont(); } else status = B_BAD_VALUE; } @@ -1178,9 +1169,9 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link) // 3) float - size fLink.StartMessage(B_OK); - fLink.AttachString(family); - fLink.AttachString(style); - fLink.Attach(size); + fLink.AttachString(font.GetFamily()); + fLink.AttachString(font.GetStyle()); + fLink.Attach(font.Size()); } else fLink.StartMessage(status);