Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CharacterMap: show font family and style

Browse Source 
Signed-off-by: Adrien Destugues <pulkomandy@gmail.com>

Fixes #3651 item 2.
This commit is contained in:
dsizzle 2014-11-25 20:04:23 +00:00 committed by Adrien Destugues
parent aca8c0ceb2
commit c3205c10d7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/apps/charactermap/CharacterWindow.cpp
View File

@ -171,9 +171,18 @@ CharacterWindow::CharacterWindow()
const char* family;
const char* style;
BString displayName;
if (settings.FindString("font family", &family) == B_OK
&& settings.FindString("font style", &style) == B_OK) {
_SetFont(family, style);
displayName << family << " " << style;
} else {
font_family currentFontFamily;
font_style currentFontStyle;
fCharacterView->CharacterFont().GetFamilyAndStyle(&currentFontFamily,
&currentFontStyle);
displayName << currentFontFamily << " " << currentFontStyle;
}
int32 fontSize;
@ -193,7 +202,7 @@ CharacterWindow::CharacterWindow()
fCharacterView, 0, false, true);
fFontSizeSlider = new FontSizeSlider("fontSizeSlider",
B_TRANSLATE("Font size:"),
displayName,
new BMessage(kMsgFontSizeChanged), kMinFontSize, kMaxFontSize);
fFontSizeSlider->SetValue(fontSize);
@ -344,6 +353,12 @@ CharacterWindow::MessageReceived(BMessage* message)
fSelectedFontItem = item;
_SetFont(item->Menu()->Name(), item->Label());
BString displayName;
displayName << item->Menu()->Name() << " " << item->Label();
fFontSizeSlider->SetLabel(displayName);
item = item->Menu()->Superitem();
item->SetMarked(true);
}