Changeset 318 for trunk/src/gui/text/qfontdatabase.cpp

Timestamp:

Nov 13, 2009, 11:57:53 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/text: Keep track of scripts supported by individual styles within a font family to make sure that if some style doesn't support all scripts the other style does, the font matching algorithm will select another family for this style instead of drawing empty boxes.

File:

• trunk/src/gui/text/qfontdatabase.cpp (modified) (6 diffs)

trunk/src/gui/text/qfontdatabase.cpp

@@ -145 +145 @@
                                 uint yres = 0, uint avgwidth = 0, bool add = false);
 #endif // Q_WS_X11
+#ifdef Q_WS_PM
+    QList<QFontDatabase::WritingSystem> systems;
+#endif
 #if defined(Q_WS_QWS) || defined(Q_WS_PM)
     QByteArray fileName;
@@ -224 +227 @@
             free(pixelSizes[count].encodings);
 #endif
+#ifdef Q_WS_PM
+            pixelSizes[count].systems.~QList<QFontDatabase::WritingSystem>();
+#endif
 #if defined(Q_WS_QWS) || defined(Q_WS_PM)
             pixelSizes[count].fileName.~QByteArray();
@@ -279 +285 @@
     pixelSizes[count].count = 0;
     pixelSizes[count].encodings = 0;
+#endif
+#ifdef Q_WS_PM
+    new (&pixelSizes[count].systems) QList<QFontDatabase::WritingSystem>;
 #endif
 #if defined(Q_WS_QWS) || defined(Q_WS_PM)
@@ -965 +974 @@
 #endif // Q_WS_X11
 
+#if defined(Q_WS_PM)
+static bool sizeSupportsScript(int script, QtFontSize *size)
+{
+    // empty writing system list means we support all
+    // (see qfontdatabase_pm.cpp for explanation)
+    if (size->systems.isEmpty())
+        return true;
+    foreach (QFontDatabase::WritingSystem ws, size->systems) {
+        if (scriptForWritingSystem[ws] == script)
+            return true;
+    }
+    return false;
+}
+#endif // Q_WS_PM
+
 #if !defined(Q_WS_MAC)
 static
@@ -1046 +1070 @@
                 }
 #endif
+#ifdef Q_WS_PM
+                if (!sizeSupportsScript(script, style->pixelSizes + x)) {
+                    FM_DEBUG("          size %3d does not support the script we want",
+                             style->pixelSizes[x].pixelSize);
+                    continue;
+                }
+#endif
 
                 unsigned int d;
@@ -1090 +1121 @@
         }
 #endif // Q_WS_X11
+#ifdef Q_WS_PM
+        if (size) {
+            if (!sizeSupportsScript(script, size)) {
+                size = 0;
+                FM_DEBUG("          foundry doesn't support the script we want");
+                continue;
+            }
+        }
+#endif
 
         unsigned int this_score = 0x0000;