Index: WebKit/haiku/WebPositive/support/FontSelectionView.cpp =================================================================== --- WebKit/haiku/WebPositive/support/FontSelectionView.cpp (revision 521) +++ WebKit/haiku/WebPositive/support/FontSelectionView.cpp (working copy) @@ -42,11 +42,12 @@ FontSelectionView::FontSelectionView(const char* name, const char* label, - bool separateStyles, const BFont* currentFont) + bool separateStyles, const BFont* currentFont, bool useAnyFont) : BHandler(name), fMessage(NULL), - fTarget(NULL) + fTarget(NULL), + fAnyFont(useAnyFont) { if (currentFont == NULL) fCurrentFont = _DefaultFont(); @@ -157,7 +158,8 @@ if (styleItem != NULL) { styleItem->SetMarked(true); - fCurrentFont.SetFamilyAndStyle(family, styleItem->Label()); + fCurrentFont.SetFamilyAndStyle(family, + fAnyFont ? NULL : styleItem->Label()); _UpdateFontPreview(); } if (fStylesMenuField != NULL) @@ -183,7 +185,8 @@ _SelectCurrentFont(false); familyItem->SetMarked(true); - fCurrentFont.SetFamilyAndStyle(family, style); + fCurrentFont.SetFamilyAndStyle(family, + fAnyFont ? NULL : style); _UpdateFontPreview(); _Invoke(); break; @@ -318,7 +321,7 @@ continue; // if we're setting the fixed font, we only want to show fixed fonts - if (!strcmp(Name(), "fixed") && (flags & B_IS_FIXED) == 0) + if (!fAnyFont && !strcmp(Name(), "fixed") && (flags & B_IS_FIXED) == 0) continue; font.SetFamilyAndFace(family, B_REGULAR_FACE); @@ -420,6 +423,8 @@ BFont FontSelectionView::_DefaultFont() const { + if (fAnyFont) + return *be_plain_font; if (strcmp(Name(), "bold") == 0) return *be_bold_font; if (strcmp(Name(), "fixed") == 0) Index: WebKit/haiku/WebPositive/support/FontSelectionView.h =================================================================== --- WebKit/haiku/WebPositive/support/FontSelectionView.h (revision 521) +++ WebKit/haiku/WebPositive/support/FontSelectionView.h (working copy) @@ -29,7 +29,7 @@ public: FontSelectionView(const char* name, const char* label, bool separateStyles, - const BFont* font = NULL); + const BFont* font = NULL, bool useAnyFont = true); virtual ~FontSelectionView(); void AttachedToLooper(); @@ -86,6 +86,7 @@ BMessage* fMessage; BHandler* fTarget; + bool fAnyFont; }; #endif // FONT_SELECTION_VIEW_H