Revert "Appearance: fix "Fixed font" menu after the change to "Noto Sans Mono"."

This reverts commit aa3c64e46d.

Reason: the previous change is to be reverted.
This commit is contained in:
Jérôme Duval
2018-08-02 14:17:46 +02:00
parent aa3c64e46d
commit 033f3450e3
@@ -15,16 +15,14 @@
#include <Box.h>
#include <Catalog.h>
#include <GroupLayoutBuilder.h>
#include <LayoutItem.h>
#include <Locale.h>
#include <MenuField.h>
#include <MenuItem.h>
#include <PopUpMenu.h>
#include <String.h>
#include <StringView.h>
#include <FontPrivate.h>
#include <LayoutItem.h>
#include <GroupLayoutBuilder.h>
#include <stdio.h>
@@ -451,13 +449,9 @@ FontSelectionView::UpdateFontsMenu()
if (get_font_family(i, &family, &flags) != B_OK)
continue;
// if we're setting the fixed font, we only want to show fixed and
// full-and-half-fixed fonts
if (strcmp(Name(), "fixed") == 0
&& (flags
& (B_IS_FIXED | B_PRIVATE_FONT_IS_FULL_AND_HALF_FIXED)) == 0) {
// if we're setting the fixed font, we only want to show fixed fonts
if (!strcmp(Name(), "fixed") && (flags & B_IS_FIXED) == 0)
continue;
}
float width = font.StringWidth(family);
if (width > fMaxFontNameWidth)