[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r137163 - trunk/moon/src
From:       "Jeff Stedfast" <mono-patches-list () lists ! ximian ! com>
Date:       2009-06-30 20:50:30
Message-ID: 20090630205030.6810B9472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: fejj
Date: 2009-06-30 16:50:29 -0400 (Tue, 30 Jun 2009)
New Revision: 137163

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/fontmanager.cpp
Log:
2009-06-30  Jeffrey Stedfast  <fejj@novell.com>

	* fontmanager.cpp (style_diff): Improved a bit so that we never
	return G_MAXINT if any font by the same name is found, no matter
	what style differences there are.



Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog	2009-06-30 20:41:02 UTC (rev 137162)
+++ trunk/moon/src/ChangeLog	2009-06-30 20:50:29 UTC (rev 137163)
@@ -1,3 +1,9 @@
+2009-06-30  Jeffrey Stedfast  <fejj@novell.com>
+
+	* fontmanager.cpp (style_diff): Improved a bit so that we never
+	return G_MAXINT if any font by the same name is found, no matter
+	what style differences there are.
+
 2009-06-30  Jackson Harper  <jackson@ximian.com>
 
 	* deepzoomimagetilesource.cpp: Parsers need to be freed.

Modified: trunk/moon/src/fontmanager.cpp
===================================================================
--- trunk/moon/src/fontmanager.cpp	2009-06-30 20:41:02 UTC (rev 137162)
+++ trunk/moon/src/fontmanager.cpp	2009-06-30 20:50:29 UTC (rev 137163)
@@ -1225,18 +1225,14 @@
 	if (actual->slant == desired->slant)
 		return weight;
 	
-	if (actual->slant == FontStylesNormal && desired->slant == FontStylesItalic) {
-		// we can emulate italic, but we would still prefer the real
+	if (actual->slant == FontStylesNormal) {
+		// we can emulate italic/oblique, but we would still prefer the real
 		// italic font if we can find it so apply a slight penalty
 		return 1000 + weight;
 	}
 	
-	if (actual->slant != FontStylesNormal && desired->slant != FontStylesNormal) {
-		// ouch, apply a huge penalty
-		return 1000000 + weight;
-	}
-	
-	return G_MAXINT;
+	// ouch, apply a huge penalty
+	return 1000000 + weight;
 }
 
 static FaceInfo *

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]