CVSROOT: /sources/classpath
Module name: classpath
Changes by: Sven de Marothy <smarothy> 06/06/09 20:40:59
Modified files:
. : ChangeLog
gnu/java/awt/peer/gtk: CairoGraphics2D.java
Log message:
2006-06-08 Sven de Marothy <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java
(drawString): Use TextLayout instead of GlyphVector.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7744&r2=1.7745
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.16&r2=1.17
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7744
retrieving revision 1.7745
diff -u -b -r1.7744 -r1.7745
--- ChangeLog 9 Jun 2006 20:23:54 -0000 1.7744
+++ ChangeLog 9 Jun 2006 20:40:58 -0000 1.7745
@@ -1,5 +1,10 @@
2006-06-08 Sven de Marothy <[EMAIL PROTECTED]>
+ * gnu/java/awt/peer/gtk/CairoGraphics2D.java
+ (drawString): Use TextLayout instead of GlyphVector.
+
+2006-06-08 Sven de Marothy <[EMAIL PROTECTED]>
+
* java/text/Bidi.java: Treat WS as neutral for rules N1 & N2.
* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
New constructor for bidirectionality.
Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java 9 Jun 2006 16:04:20 -0000
1.16
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java 9 Jun 2006 20:40:59 -0000
1.17
@@ -63,6 +63,7 @@
import java.awt.Toolkit;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
+import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform;
import java.awt.geom.Arc2D;
import java.awt.geom.Area;
@@ -1271,8 +1272,8 @@
{
if (str == null || str.length() == 0)
return;
-
- drawGlyphVector(getFont().createGlyphVector(null, str), x, y);
+ (new TextLayout( str, getFont(), getFontRenderContext() )).
+ draw(this, x, y);
}
public void drawString(String str, int x, int y)
