getting font metrics from default toolkit

codeanticode · codeanticode · commit 0039c1926659 · 2014-11-17T09:54:52.000-07:00
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -3,7 +3,6 @@
 import java.awt.Canvas;
 import java.awt.Font;
 import java.awt.FontMetrics;
-import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
@@ -1196,26 +1195,25 @@ protected void disableTexturing(int target) {
 
   @Override
   protected int getFontAscent(Font font) {
-    //FontMetrics metrics = pg.parent.getFontMetrics(font);
     @SuppressWarnings("deprecation")
     FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics(font);
     return metrics.getAscent();
   }
 
 
   protected int getFontDescent(Object font) {
+    FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics((Font)font);
 //    FontMetrics metrics = pg.parent.getFontMetrics((Font)font);
-//    return metrics.getDescent();
-    return 0;
+    return metrics.getDescent();
   }
 
 
   protected int getTextWidth(Object font, char buffer[], int start, int stop) {
     // maybe should use one of the newer/fancier functions for this?
-//    int length = stop - start;
+    int length = stop - start;
 //    FontMetrics metrics = pg.parent.getFontMetrics((Font)font);
-//    return metrics.charsWidth(buffer, start, length);
-    return 0;
+    FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics((Font)font);
+    return metrics.charsWidth(buffer, start, length);
   }
 
 
@@ -1399,8 +1397,8 @@ protected class FontOutline implements PGL.FontOutline {
 
     public FontOutline(char ch, Object font) {
       char textArray[] = new char[] { ch };
-      Graphics2D graphics = (Graphics2D) pg.parent.frame.getGraphics();
-      FontRenderContext frc = graphics.getFontRenderContext();
+//      Graphics2D graphics = (Graphics2D) pg.parent.frame.getGraphics();
+      FontRenderContext frc = pg.getFontRenderContext((Font)font);
       GlyphVector gv = ((Font)font).createGlyphVector(frc, textArray);
       Shape shp = gv.getOutline();
       iter = shp.getPathIterator(null);
