Ticket #3759: 3759.diff

File 3759.diff, 1.0 KB (added by maxime.simon, 15 years ago)

In system default font calls, considers the menu font as a plain font.

  • src/preferences/fonts/FontSelectionView.cpp

     
    381381    font_family family;
    382382    font_style style;
    383383    float size;
    384     if (_get_system_default_font_(Name(), family, style, &size) != B_OK) {
     384    const char* fontName;
     385
     386    if (!strcmp(Name(), "menu"))
     387        fontName = "plain";
     388    else
     389        fontName = Name();
     390
     391    if (_get_system_default_font_(fontName, family, style, &size) != B_OK) {
    385392        Revert();
    386393        return;
    387394    }
     
    425432    font_family defaultFamily;
    426433    font_style defaultStyle;
    427434    float defaultSize;
     435    const char* fontName;
    428436
    429     if (_get_system_default_font_(Name(), defaultFamily, defaultStyle, &defaultSize) != B_OK)
     437    if (!strcmp(Name(), "menu"))
     438        fontName = "plain";
     439    else
     440        fontName = Name();
     441
     442    if (_get_system_default_font_(fontName, defaultFamily, defaultStyle, &defaultSize) != B_OK)
    430443        return false;
    431444
    432445    font_family currentFamily;