Changeset 238 for trunk/src

Timestamp:

Oct 16, 2009, 10:46:02 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Temporarily substitute the "WarpSans" font with "Workplace Sans" until we support OS/2 bitmap fonts (to get more native look and feel if "Workplace Sans" is installed).

File:

• trunk/src/gui/text/qfontdatabase_pm.cpp (modified) (3 diffs)

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -296 +296 @@
                         cached.styleKey.weight = QFont::Black;
 
+                    // @todo "Workplace Sans" from Alex Taylor has weight class
+                    // < 400 whic makes it Light. It has some bad side effects
+                    // in Qt, in particular, requesting Normal will select Bold
+                    // instead of Light if "Workplace Sans Bold" is also installed.
+                    // For this reason, we override the weight here. Remove the
+                    // hack if the font is changed to Normal.
+                    if (cached.familyName == QLatin1String("Workplace Sans")) {
+                        if (cached.styleKey.weight == QFont::Light)
+                            cached.styleKey.weight = QFont::Normal;
+                    }
+
                     switch (os2_table->usWidthClass) {
                         case 1: cached.styleKey.stretch = QFont::UltraCondensed; break;
@@ -401 +412 @@
                 //
                 // @todo find a proper way to detect actual supported scripts to make
-                // sure these fonts are not matched for scripts they don't support
+                // sure these fonts are not matched for scripts they don't support.
+                //
+                // @todo remove the hack for "Workplace Sans" once it is corrected
                 for (int ws = 0; ws < QFontDatabase::WritingSystemsCount; ++ws)
                     family->writingSystems[ws] = QtFontFamily::Supported;
@@ -642 +655 @@
         req.stretch = 100;
 
+    // @todo a hack to substitute "WarpSans" with "Workplace Sans". Remove this
+    // when we start supporting OS/2 bitmap fonts.
+    if (req.family == QLatin1String("WarpSans"))
+        req.family = QLatin1String("Workplace Sans");
+
     QFontCache::Key key(req, d->rawMode ? QUnicodeTables::Common : script, d->screen);
     if (!d->engineData)