summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven de Marothy <sven@physto.se>2006-06-09 20:40:58 +0000
committerSven de Marothy <sven@physto.se>2006-06-09 20:40:58 +0000
commitf64d729e2f1b79fc5ace1c47c681a820af38f5b3 (patch)
tree0b9bcd4d755912ed9bc0ea8f35ac32ecb34c6edf
parent5030a2096a5b2953f3d7a02afd104a5b74a1307f (diff)
downloadclasspath-f64d729e2f1b79fc5ace1c47c681a820af38f5b3.tar.gz
2006-06-08 Sven de Marothy <sven@physto.se>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawString): Use TextLayout instead of GlyphVector.
-rw-r--r--ChangeLog5
-rw-r--r--gnu/java/awt/peer/gtk/CairoGraphics2D.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d396358e9..23bb586f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-06-08 Sven de Marothy <sven@physto.se>
+ * gnu/java/awt/peer/gtk/CairoGraphics2D.java
+ (drawString): Use TextLayout instead of GlyphVector.
+
+2006-06-08 Sven de Marothy <sven@physto.se>
+
* java/text/Bidi.java: Treat WS as neutral for rules N1 & N2.
* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
New constructor for bidirectionality.
diff --git a/gnu/java/awt/peer/gtk/CairoGraphics2D.java b/gnu/java/awt/peer/gtk/CairoGraphics2D.java
index 207dcab2e..a0503e78c 100644
--- a/gnu/java/awt/peer/gtk/CairoGraphics2D.java
+++ b/gnu/java/awt/peer/gtk/CairoGraphics2D.java
@@ -63,6 +63,7 @@ import java.awt.TexturePaint;
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 @@ public abstract class CairoGraphics2D extends Graphics2D
{
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)