Changeset 373 for trunk/src

Timestamp:

Dec 2, 2009, 5:16:18 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk/src/gui/text

Files:

• qfont_pm.cpp (modified) (1 diff)
• qfontdatabase_pm.cpp (modified) (3 diffs)

trunk/src/gui/text/qfont_pm.cpp

@@ -71 +71 @@
     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

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -752 +752 @@
 }
 
+static QString getAssociateFont()
+{
+    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] != ';')
+        return QString::fromLocal8Bit(szFontName);
+
+    return QString::null;
+}
+
 static QFontEngine *loadPM(const QFontPrivate *d, int script, const QFontDef &req)
 {
@@ -763 +794 @@
     // add the default family
     QString defaultFamily = QApplication::font().family();
-    if (! families.contains(defaultFamily))
+    if (!families.contains(defaultFamily))
         families << defaultFamily;
 
@@ -769 +800 @@
     // previous versions
     families << QApplication::font().defaultFamily();
+
+    // add PM_AssociateFont to the list (used on DBCS systems to take the
+    // missing glyphs from)
+    QString associateFont = getAssociateFont();
+    if (!associateFont.isEmpty() && !families.contains(associateFont))
+        families << associateFont;
 
     // null family means find the first font matching the specified script