[cp-patches] FYI: FontMetrics for X Fonts

[Roman Kennke]

This re-enables font metrics for X Fonts.

2006-01-09  Roman Kennke  <[EMAIL PROTECTED]>

        * gnu/java/awt/peer/x/XWindowPeer.java
        (getFontMetrics): Re-enable that for X fonts.

/Roman

-- 
http://kennke.org/blog/

Index: gnu/java/awt/peer/x/XWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/x/XWindowPeer.java,v
retrieving revision 1.5
diff -u -1 -0 -r1.5 XWindowPeer.java
--- gnu/java/awt/peer/x/XWindowPeer.java	20 Sep 2007 14:01:09 -0000	1.5
+++ gnu/java/awt/peer/x/XWindowPeer.java	9 Jan 2008 22:05:08 -0000
@@ -54,20 +54,21 @@
 import java.awt.Rectangle;
 import java.awt.event.PaintEvent;
 import java.awt.event.WindowEvent;
 import java.awt.image.VolatileImage;
 
 import gnu.x11.Atom;
 import gnu.x11.Window;
 import gnu.x11.event.Event;
 
 import gnu.java.awt.font.OpenTypeFontPeer;
+import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.java.awt.peer.swing.SwingWindowPeer;
 
 public class XWindowPeer
     extends SwingWindowPeer
 {
 
   private static int standardSelect = Event.BUTTON_PRESS_MASK
                                       | Event.BUTTON_RELEASE_MASK
                                       | Event.POINTER_MOTION_MASK
                                       //| Event.RESIZE_REDIRECT_MASK
@@ -283,22 +284,21 @@
     return (Insets) insets.clone();
   }
 
   /**
    * Returns the font metrics for the specified font.
    *
    * @return the font metrics for the specified font
    */
   public FontMetrics getFontMetrics(Font font)
   {
-    // FIXME: Fix this for X fonts.
-    OpenTypeFontPeer fontPeer = (OpenTypeFontPeer) font.getPeer();
+    ClasspathFontPeer fontPeer = (ClasspathFontPeer) font.getPeer();
     return fontPeer.getFontMetrics(font);
   }
 
   /**
    * Unregisters the window in the event pump when it is closed.
    */
   protected void finalize()
   {
     XGraphicsDevice dev = XToolkit.getDefaultDevice();
     dev.getEventPump().unregisterWindow(xwindow);