Ticket #3651: 3651-2.patch

CharacterWindow.cpp

@@ -16 +16 @@
 #include <GroupLayoutBuilder.h>
 #include <ListView.h>
 #include <Menu.h>
+#include <PopUpMenu.h>
+#include <MenuField.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
 #include <MessageFilter.h>
@@ -192 +194 @@
     fCodeView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
         fCodeView->PreferredSize().Height()));
 
+    BMenuField* fontField = new BMenuField(BRect(0.0, 0.0, 200.0, 15.0),
+        "FontMenu", "Font:", _CreateFontMenu(), false);
+    fontField->SetAlignment(B_ALIGN_RIGHT);
+
     AddChild(BGroupLayoutBuilder(B_VERTICAL)
         .Add(menuBar)
         .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)//BSplitLayoutBuilder()
@@ -201 +207 @@
                     .Add(clearButton))
                 .Add(unicodeScroller))
             .Add(BGroupLayoutBuilder(B_VERTICAL, 10)
+                .Add(fontField)
                 .Add(characterScroller)
                 .Add(fFontSizeSlider)
                 .Add(fCodeView))
@@ -234 +241 @@
 #endif
     menuBar->AddItem(menu);
 
-    menuBar->AddItem(_CreateFontMenu());
-
     AddCommonFilter(new EscapeMessageFilter(kMsgClearFilter));
     AddCommonFilter(new RedirectUpAndDownFilter(fUnicodeBlockView));
 
@@ -463 +468 @@
 }
 
 
-BMenu*
+BPopUpMenu*
 CharacterWindow::_CreateFontMenu()
 {
-    BMenu* menu = new BMenu("Font");
+    BPopUpMenu* menu = new BPopUpMenu("Font");
 
     font_family currentFamily;
     font_style currentStyle;
@@ -478 +483 @@
     for (int32 i = 0; i < numFamilies; i++) {
         font_family family;
         if (get_font_family(i, &family) == B_OK) {
-            BMenu* subMenu = new BMenu(family);
-            menu->AddItem(new BMenuItem(subMenu,
-                new BMessage(kMsgFontSelected)));
+            int numStyles = count_font_styles(family);
 
-            int numStyles = count_font_styles(family);
             for (int32 j = 0; j < numStyles; j++) {
                 font_style style;
                 uint32 flags;
                 if (get_font_style(family, j, &style, &flags) == B_OK) {
-                    BMenuItem* item = new BMenuItem(style,
+                    BString displayName;
+                    displayName << family << " " << style;
+
+                    BMenuItem* item = new BMenuItem(displayName,
                         new BMessage(kMsgFontSelected));
-                    subMenu->AddItem(item);
+                    menu->AddItem(item);
 
                     if (!strcmp(family, currentFamily)
                         && !strcmp(style, currentStyle)) {

CharacterWindow.h

@@ -11 +11 @@
 
 class BFile;
 class BListView;
-class BMenu;
+class BPopUpMenu;
 class BMenuItem;
 class BSlider;
 class BStringView;
@@ -34 +34 @@
             status_t        _SaveSettings();
 
             void            _SetFont(const char* family, const char* style);
-            BMenu*          _CreateFontMenu();
+            BPopUpMenu*     _CreateFontMenu();
 
 private:
             BTextControl*   fFilterControl;