Sophie

Sophie

distrib > Mandriva > 2006.0 > x86_64 > by-pkgid > cc8f970be8f3f9d917634bf75d52343e > files > 51

qt3-3.3.4-23mdk.src.rpm

diff -uNr qt-x11-free-3.1.1.orig/src/kernel/qfont_x11.cpp qt-x11-free-3.1.1/src/kernel/qfont_x11.cpp
--- qt-x11-free-3.1.1.orig/src/kernel/qfont_x11.cpp	Mon Dec  9 04:40:44 2002
+++ qt-x11-free-3.1.1/src/kernel/qfont_x11.cpp	Wed Dec 18 00:04:39 2002
@@ -1570,7 +1570,8 @@
 	*scale = 1.;
     }
 
-    mono_value = request.fixedPitch ? XFT_MONO : XFT_PROPORTIONAL;
+    mono_value = !request.fixedPitch || familyName == "monospace"
+	         ? XFT_PROPORTIONAL : XFT_MONO;
 
     switch (request.styleHint) {
     case QFont::SansSerif:
@@ -1582,7 +1583,7 @@
 	break;
     case QFont::TypeWriter:
 	generic_value = "mono";
-	mono_value = XFT_MONO;
+	mono_value = XFT_PROPORTIONAL;
 	break;
     }
 
diff -uNr qt-x11-free-3.1.1.orig/src/kernel/qfontdatabase_x11.cpp qt-x11-free-3.1.1/src/kernel/qfontdatabase_x11.cpp
--- qt-x11-free-3.1.1.orig/src/kernel/qfontdatabase_x11.cpp	Tue Dec 17 23:54:35 2002
+++ qt-x11-free-3.1.1/src/kernel/qfontdatabase_x11.cpp	Wed Dec 18 00:03:08 2002
@@ -412,6 +412,8 @@
                      style->weightString = getXftWeightString(XFT_WEIGHT_BOLD);
                }
 
+	       if (alias_font[f] == "monospace")
+		   style->setFixedPitch();
                style->lesserItal = FALSE;
                style->setSmoothlyScalable();
                family->addStyle (style);