Changeset 13535 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 23, 2008 1:35:11 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3217: "Font substitution fix not always works". This is 3rd try to fix that problem with some logging. Need to check on OpenSolaris.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/src/main.cpp

@@ -246 +246 @@
          * font family if it is non scaleable-anti-aliased. */
         QFontDatabase fontDataBase;
-        QString subFamily (QFont::substitute (QApplication::font().family()));
-        bool isScaleable = fontDataBase.isScalable (subFamily);
-        if (!isScaleable)
-            QFont::removeSubstitution (QApplication::font().family());
+
+        QString currentFamily (QApplication::font().family());
+        bool isCurrentScaleable = fontDataBase.isScalable (currentFamily);
+        LogFlowFunc (("Font: Current family is '%s'. It is %s.\n",
+            currentFamily.toLatin1().constData(),
+            isCurrentScaleable ? "scalable" : "not scalable"));
+
+        QStringList subFamilies (QFont::substitutes (currentFamily));
+        foreach (QString sub, subFamilies)
+        {
+            bool isSubScalable = fontDataBase.isScalable (sub);
+            LogFlowFunc (("Font: Substitute family is '%s'. It is %s.\n",
+                sub.toLatin1().constData(),
+                isSubScalable ? "scalable" : "not scalable"));
+        }
+
+        QString subFamily (QFont::substitute (currentFamily));
+        bool isSubScaleable = fontDataBase.isScalable (subFamily);
+        if (isCurrentScaleable && !isSubScaleable)
+            QFont::removeSubstitution (currentFamily);
 #endif