From 6722e2f797fd888265e22ed4871e9d11b75e5afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 31 Mar 2009 11:55:59 +0000 Subject: [PATCH] * Temporarily removed the "Only Show Blocks Contained in Font" - Haiku does not yet support this. * Made sure the correct font is selected at start. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29816 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/charactermap/CharacterWindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index 330763ed13..5e97f09001 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -146,9 +146,12 @@ CharacterWindow::CharacterWindow() menu->AddItem(item = new BMenuItem("Show Private Blocks", new BMessage(kMsgPrivateBlocks))); item->SetMarked(fCharacterView->IsShowingPrivateBlocks()); +// TODO: this feature is not yet supported by Haiku! +#if 0 menu->AddItem(item = new BMenuItem("Only Show Blocks Contained in Font", new BMessage(kMsgContainedBlocks))); item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly()); +#endif menuBar->AddItem(menu); menuBar->AddItem(_CreateFontMenu()); @@ -339,7 +342,8 @@ CharacterWindow::_CreateFontMenu() font_family currentFamily; font_style currentStyle; - be_plain_font->GetFamilyAndStyle(¤tFamily, ¤tStyle); + fCharacterView->CharacterFont().GetFamilyAndStyle(¤tFamily, + ¤tStyle); int32 numFamilies = count_font_families(); @@ -385,7 +389,7 @@ CharacterWindow::_UpdateUnicodeBlocks() if (item->IsEnabled() != enabled) { item->SetEnabled(enabled); fUnicodeBlockView->InvalidateItem(i); - } + } } } @@ -404,7 +408,6 @@ CharacterWindow::_CreateUnicodeBlocks() } fUnicodeBlockView->SetExplicitMinSize(BSize(minWidth / 2, 32)); - // TODO: why is this ignored? fUnicodeBlockView->SetExplicitMaxSize(BSize(minWidth, B_SIZE_UNSET)); _UpdateUnicodeBlocks();