add getFontMetrics() override

benfry · benfry · commit 6487f6294e52 · 2014-11-17T17:09:09.000-05:00
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -27,6 +27,7 @@
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
@@ -4801,11 +4802,21 @@ protected void textCharScreenImpl(PImage glyph,
 
 
   /**
-   * Convenience method to jump through some Java2D hoops and get an FRC.
+   * Convenience method to get a legit FontMetrics object. Where possible,
+   * override this any renderer subclass so that you're not using what's
+   * returned by getDefaultToolkit() to get your metrics.
    */
   @SuppressWarnings("deprecation")
+  public FontMetrics getFontMetrics(Font font) {  // ignore
+    return Toolkit.getDefaultToolkit().getFontMetrics(font);
+  }
+
+
+  /**
+   * Convenience method to jump through some Java2D hoops and get an FRC.
+   */
   public FontRenderContext getFontRenderContext(Font font) {  // ignore
-    return Toolkit.getDefaultToolkit().getFontMetrics(font).getFontRenderContext();
+    return getFontMetrics(font).getFontRenderContext();
   }
 
 
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
@@ -1746,9 +1746,7 @@ public float textAscent() {
 
     Font font = (Font) textFont.getNative();
     if (font != null) {
-      @SuppressWarnings("deprecation")
-      FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics(font);
-      return metrics.getAscent();
+      return getFontMetrics(font).getAscent();
     }
     return super.textAscent();
   }
@@ -1761,9 +1759,7 @@ public float textDescent() {
     }
     Font font = (Font) textFont.getNative();
     if (font != null) {
-      @SuppressWarnings("deprecation")
-      FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics(font);
-      return metrics.getDescent();
+      return getFontMetrics(font).getDescent();
     }
     return super.textDescent();
   }
@@ -1852,7 +1848,7 @@ protected float textWidthImpl(char buffer[], int start, int stop) {
     if (font != null) {
       // maybe should use one of the newer/fancier functions for this?
       int length = stop - start;
-      FontMetrics metrics = g2.getFontMetrics(font);
+      FontMetrics metrics = getFontMetrics(font);
       // Using fractional metrics makes the measurement worse, not better,
       // at least on OS X 10.6 (November, 2010).
       // TextLayout returns the same value as charsWidth().
@@ -1964,6 +1960,11 @@ protected void textLineImpl(char buffer[], int start, int stop,
   }
 
 
+  @Override
+  public FontMetrics getFontMetrics(Font font) {
+    return (g2 != null) ? g2.getFontMetrics(font) : super.getFontMetrics(font);
+  }
+
 
   //////////////////////////////////////////////////////////////
 
