set size of fonts in Android2D, fixes #248

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -1246,10 +1246,16 @@ public PShape loadShape(String filename) {
   public void textFont(PFont which) {
     super.textFont(which);
     fillPaint.setTypeface((Typeface) which.getNative());
+    fillPaint.setTextSize(which.getDefaultSize());
   }
 
 
-  //public void textFont(PFont which, float size)
+  @Override
+  public void textFont(PFont which, float size) {
+    super.textFont(which, size);
+    fillPaint.setTypeface((Typeface) which.getNative());
+    fillPaint.setTextSize(which.getDefaultSize());
+  }
 
 
   //public void textLeading(float leading)
@@ -1281,14 +1287,7 @@ public void textSize(float size) {
       fillPaint.setTextSize(size);
     }
 
-    // take care of setting the textSize and textLeading vars
-    // this has to happen second, because it calls textAscent()
-    // (which requires the native font metrics to be set)
-    textSize = size;
-//    PApplet.println("P2D textSize textAscent -> " + textAscent());
-//    PApplet.println("P2D textSize textDescent -> " + textDescent());
-    textLeading = (textAscent() + textDescent()) * 1.275f;
-//    PApplet.println("P2D textSize textLeading = " + textLeading);
+    handleTextSize(size);
   }
 
 

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -3493,7 +3493,7 @@ protected void handleTextSize(float size) {
     Object font = textFont.getNative();
     if (font != null) {
       Object dfont = pgl.getDerivedFont(font, size);
-      textFont.setNative(dfont);
+      if (dfont != null) textFont.setNative(dfont);
     }
     super.handleTextSize(size);
   }