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
This commit is contained in:
@@ -338,14 +338,18 @@ TermWindow::_SetupMenu()
|
|||||||
void
|
void
|
||||||
TermWindow::_GetPreferredFont(BFont &font)
|
TermWindow::_GetPreferredFont(BFont &font)
|
||||||
{
|
{
|
||||||
|
// Default to be_fixed_font
|
||||||
|
font = be_fixed_font;
|
||||||
|
|
||||||
const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
|
const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
|
||||||
|
const char *style = PrefHandler::Default()->getString(PREF_HALF_FONT_STYLE);
|
||||||
font.SetFamilyAndStyle(family, NULL);
|
|
||||||
|
font.SetFamilyAndStyle(family, style);
|
||||||
|
|
||||||
float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
|
float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
|
||||||
if (size < 6.0f)
|
if (size < 6.0f)
|
||||||
size = 6.0f;
|
size = 6.0f;
|
||||||
font.SetSize(size);
|
font.SetSize(size);
|
||||||
font.SetSpacing(B_FIXED_SPACING);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -614,7 +618,6 @@ TermWindow::MessageReceived(BMessage *message)
|
|||||||
case kIncreaseFontSize:
|
case kIncreaseFontSize:
|
||||||
case kDecreaseFontSize:
|
case kDecreaseFontSize:
|
||||||
{
|
{
|
||||||
message->PrintToStream();
|
|
||||||
TermView *view = _ActiveTermView();
|
TermView *view = _ActiveTermView();
|
||||||
BFont font;
|
BFont font;
|
||||||
view->GetTermFont(&font);
|
view->GetTermFont(&font);
|
||||||
|
|||||||
Reference in New Issue
Block a user