Ticket #102: once.diff

src/gui/text/qfontdatabase_pm.cpp

@@ -751 +751 @@
     return fe;
 }
 
+static void addAssociateFont(QStringList &families)
+{
+    static char szFontName[FACESIZE + 1] = {0,};
+
+    // already queried ?
+    if (szFontName[0] == '\0') {
+        // query the associated font
+        if (PrfQueryProfileString(HINI_USERPROFILE,
+                                  "PM_SystemFonts", "PM_AssociateFont", 0,
+                                  szFontName, sizeof(szFontName))) {
+            szFontName[FACESIZE] = '\0';
+
+            // the format of the associated font is face_name;point_size
+            // so remove ';' and later
+            for (PSZ pch = szFontName; *pch; pch++)
+                if (*pch == ';') {
+                    *pch = '\0';
+                    break;
+                }
+        }
+
+        if (szFontName[0] == '\0')
+            szFontName[0] = ';';
+    }
+
+    if (szFontName[0] != ';')
+        families << QString::fromLocal8Bit(szFontName);
+}
+
 static QFontEngine *loadPM(const QFontPrivate *d, int script, const QFontDef &req)
 {
     // list of families to try
@@ -769 +798 @@
     // previous versions
     families << QApplication::font().defaultFamily();
 
+    // add PM_AssociateFont to the list
+    addAssociateFont(families);
+
     // null family means find the first font matching the specified script
     families << QString();
 

src/gui/text/qfont_pm.cpp

@@ -70 +70 @@
         break;
     case QFont::AnyStyle:
     default:
-        static char szFontName[FACESIZE + 1] = {0,};
-
-        // already queried ?
-        if (szFontName[0] != ';') {
-            szFontName[0] = ';';
-            // query the associated font
-            if (PrfQueryProfileString(HINI_USERPROFILE,
-                                      "PM_SystemFonts", "PM_AssociateFont", 0,
-                                      szFontName, sizeof(szFontName))) {
-                szFontName[FACESIZE] = '\0';
-
-                // the format of the associated font is face_name;point_size
-                // so remove ';' and later
-                for (PSZ pch = szFontName; *pch; pch++)
-                    if (*pch == ';') {
-                        *pch = '\0';
-                        break;
-                    }
-            }
-        }
-
-        // is the associated font available ?
-        if (szFontName[0] != '\0' && szFontName[0] != ';')
-            family = szFontName;
-        else if (request.fixedPitch)
+        if (request.fixedPitch)
             family = "Courier";
         else
             family = "Helvetica";