Ignore:
Timestamp:
Dec 2, 2009, 5:16:18 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

gui: Correction for r372: Don't query PM_AssociateFont too often (patch by komh).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gui/text/qfont_pm.cpp

    r371 r373  
    7171    case QFont::AnyStyle:
    7272    default:
    73         static char szFontName[FACESIZE + 1] = {0,};
    74 
    75         // already queried ?
    76         if (szFontName[0] != ';') {
    77             szFontName[0] = ';';
    78             // query the associated font
    79             if (PrfQueryProfileString(HINI_USERPROFILE,
    80                                       "PM_SystemFonts", "PM_AssociateFont", 0,
    81                                       szFontName, sizeof(szFontName))) {
    82                 szFontName[FACESIZE] = '\0';
    83 
    84                 // the format of the associated font is face_name;point_size
    85                 // so remove ';' and later
    86                 for (PSZ pch = szFontName; *pch; pch++)
    87                     if (*pch == ';') {
    88                         *pch = '\0';
    89                         break;
    90                     }
    91             }
    92         }
    93 
    94         // is the associated font available ?
    95         if (szFontName[0] != '\0' && szFontName[0] != ';')
    96             family = szFontName;
    97         else if (request.fixedPitch)
     73        if (request.fixedPitch)
    9874            family = "Courier";
    9975        else
Note: See TracChangeset for help on using the changeset viewer.