From 57bd46cca2138a5c4f144c3e5e9708e3e75f4add Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Sun, 8 Nov 2009 11:47:04 +0000
Subject: [PATCH] Fix for bug #4489. Terminal wasn't using the saved font
 style, only the font family. Moreover, it defaulted to be_plain_font, instead
 of be_fixed_font.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33945 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/terminal/TermWindow.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index 611578ec8a..d87ac5ae79 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -338,14 +338,18 @@ TermWindow::_SetupMenu()
 void
 TermWindow::_GetPreferredFont(BFont &font)
 {
+	// Default to be_fixed_font
+	font = be_fixed_font;
+	
 	const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
-
-	font.SetFamilyAndStyle(family, NULL);
+	const char *style = PrefHandler::Default()->getString(PREF_HALF_FONT_STYLE);
+	
+	font.SetFamilyAndStyle(family, style);
+			
 	float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
 	if (size < 6.0f)
 		size = 6.0f;
 	font.SetSize(size);
-	font.SetSpacing(B_FIXED_SPACING);
 }
 
 
@@ -614,7 +618,6 @@ TermWindow::MessageReceived(BMessage *message)
 		case kIncreaseFontSize:
 		case kDecreaseFontSize:
 		{
-			message->PrintToStream();
 			TermView *view = _ActiveTermView();
 			BFont font;
 			view->GetTermFont(&font);