i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Temporarily removed the "Only Show Blocks Contained in Font" - Haiku does

Browse Source 
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
This commit is contained in:
Axel Dörfler
2009-03-31 11:55:59 +00:00
parent b045287228
commit 6722e2f797
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/charactermap/CharacterWindow.cpp
+6 -3
View File
@@ -146,9 +146,12 @@ CharacterWindow::CharacterWindow()
menu->AddItem(item = new BMenuItem("Show Private Blocks", menu->AddItem(item = new BMenuItem("Show Private Blocks",
new BMessage(kMsgPrivateBlocks))); new BMessage(kMsgPrivateBlocks)));
item->SetMarked(fCharacterView->IsShowingPrivateBlocks()); 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", menu->AddItem(item = new BMenuItem("Only Show Blocks Contained in Font",
new BMessage(kMsgContainedBlocks))); new BMessage(kMsgContainedBlocks)));
item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly()); item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly());
#endif
menuBar->AddItem(menu); menuBar->AddItem(menu);
menuBar->AddItem(_CreateFontMenu()); menuBar->AddItem(_CreateFontMenu());
@@ -339,7 +342,8 @@ CharacterWindow::_CreateFontMenu()
font_family currentFamily; font_family currentFamily;
font_style currentStyle; font_style currentStyle;
be_plain_font->GetFamilyAndStyle(&currentFamily, &currentStyle); fCharacterView->CharacterFont().GetFamilyAndStyle(&currentFamily,
&currentStyle);
int32 numFamilies = count_font_families(); int32 numFamilies = count_font_families();
@@ -385,7 +389,7 @@ CharacterWindow::_UpdateUnicodeBlocks()
if (item->IsEnabled() != enabled) { if (item->IsEnabled() != enabled) {
item->SetEnabled(enabled); item->SetEnabled(enabled);
fUnicodeBlockView->InvalidateItem(i); fUnicodeBlockView->InvalidateItem(i);
} }
} }
} }
@@ -404,7 +408,6 @@ CharacterWindow::_CreateUnicodeBlocks()
} }
fUnicodeBlockView->SetExplicitMinSize(BSize(minWidth / 2, 32)); fUnicodeBlockView->SetExplicitMinSize(BSize(minWidth / 2, 32));
// TODO: why is this ignored?
fUnicodeBlockView->SetExplicitMaxSize(BSize(minWidth, B_SIZE_UNSET)); fUnicodeBlockView->SetExplicitMaxSize(BSize(minWidth, B_SIZE_UNSET));
_UpdateUnicodeBlocks(); _UpdateUnicodeBlocks();