sets the resized native font in PGraphicsOpenGL, fix processing#2109

codeanticode · codeanticode · commit 550eaf421be7 · 2013-10-03T17:03:14.000-04:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -1900,6 +1900,11 @@ protected int getTextWidth(Object font, char buffer[], int start, int stop) {
   }
 
 
+  protected Object getDerivedFont(Object font, float size) {
+    return null;
+  }
+
+
   ///////////////////////////////////////////////////////////
 
   // Tessellator interface
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -23,6 +23,7 @@
 package processing.opengl;
 
 import processing.core.*;
+
 import java.net.URL;
 import java.nio.*;
 import java.util.*;
@@ -3281,6 +3282,18 @@ protected float textWidthImpl(char buffer[], int start, int stop) {
   }
 
 
+  @Override
+  public void textSize(float size) {
+    if (textFont == null) defaultFontOrDeath("textSize", size);
+    Object font = textFont.getNative();
+    if (font != null) {
+      Object dfont = pgl.getDerivedFont(font, size);
+      textFont.setNative(dfont);
+    }
+    super.textSize(size);
+  }
+
+
   /**
    * Implementation of actual drawing for a line of text.
    */
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -968,6 +968,12 @@ protected int getTextWidth(Object font, char buffer[], int start, int stop) {
   }
 
 
+  @Override
+  protected Object getDerivedFont(Object font, float size) {
+    return ((Font)font).deriveFont(size);
+  }
+
+
   ///////////////////////////////////////////////////////////
 
   // Tessellator
diff --git a/java/libraries/lwjgl/src/processing/lwjgl/PLWJGL.java b/java/libraries/lwjgl/src/processing/lwjgl/PLWJGL.java
@@ -354,6 +354,12 @@ protected int getTextWidth(Object font, char buffer[], int start, int stop) {
     FontMetrics metrics = pg.parent.getFontMetrics((Font)font);
     return metrics.charsWidth(buffer, start, length);
   }
+  
+  
+  @Override
+  protected Object getDerivedFont(Object font, float size) {
+    return ((Font)font).deriveFont(size);
+  } 
  
   
   ///////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -1900,6 +1900,11 @@ protected int getTextWidth(Object font, char buffer[], int start, int stop) {`
`1900`	`1900`	`}`
`1901`	`1901`
`1902`	`1902`
	`1903`	`+ protected Object getDerivedFont(Object font, float size) {`
	`1904`	`+ return null;`
	`1905`	`+ }`
	`1906`	`+`
	`1907`	`+`
`1903`	`1908`	`///////////////////////////////////////////////////////////`
`1904`	`1909`
`1905`	`1910`	`// Tessellator interface`