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

Timestamp:

Oct 22, 2008 3:46:18 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3217: "Font substitution fix not always works". This is try to fix that problem, need to be checked for OpenSolaris.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/main.cpp (modified) (2 diffs)

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

@@ -32 +32 @@
 #endif
 
+#ifdef Q_WS_X11
+#include <QFontDatabase>
+#endif
+
 #include <QCleanlooksStyle>
 #include <QPlastiqueStyle>
@@ -266 +270 @@
 #ifdef Q_WS_X11
     /* Cause Qt4 has the conflict with fontconfig application as a result
-     * substituting some fonts with non anti-aliased bitmap font we are
-     * reseting all the substitutes here for the current application font. */
-# ifndef Q_OS_SOLARIS
-    QFont::removeSubstitution (QApplication::font().family());
-# endif /* Q_OS_SOLARIS */
+     * sometimes substituting some fonts with non scaleable-anti-aliased
+     * bitmap font we are reseting substitutes for the current application
+     * font family if it is non scaleable-anti-aliased. */
+    QFontDatabase fontDataBase;
+    QString subFamily (QFont::substitute (QApplication::font().family()));
+    bool isScaleable = fontDataBase.isSmoothlyScalable (subFamily);
+    if (!isScaleable)
+        QFont::removeSubstitution (QApplication::font().family());
 #endif