cleanup and force load of mono font (#4639)

benfry · benfry · commit dde59dda8e51 · 2016-08-28T14:40:48.000-04:00
diff --git a/app/src/processing/app/syntax/TextAreaPainter.java b/app/src/processing/app/syntax/TextAreaPainter.java
@@ -10,15 +10,23 @@
  */
 package processing.app.syntax;
 
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
-import java.awt.*;
 
 import javax.swing.ToolTipManager;
 import javax.swing.text.*;
 import javax.swing.JComponent;
 
 import processing.app.Preferences;
 import processing.app.syntax.im.CompositionTextPainter;
+import processing.app.ui.Toolkit;
 
 
 /**
@@ -107,12 +115,13 @@ public TextAreaPainter(JEditTextArea textArea, TextAreaDefaults defaults) {
 
 
   public void updateAppearance() {
-//    // unfortunately probably can't just do setDefaults() since things aren't quite set up
-//    setFont(defaults.plainFont);
-////    System.out.println("defaults font is " + defaults.font);
     setForeground(defaults.fgcolor);
     setBackground(defaults.bgcolor);
 
+    // Ensure that our monospaced font is loaded
+    // https://github.com/processing/processing/pull/4639
+    Toolkit.getMonoFontName();
+
     String fontFamily = Preferences.get("editor.font.family");
     int fontSize = Preferences.getInteger("editor.font.size");
     plainFont = new Font(fontFamily, Font.PLAIN, fontSize);
@@ -124,16 +133,11 @@ public void updateAppearance() {
     }
     boldFont = new Font(fontFamily, Font.BOLD, fontSize);
     antialias = Preferences.getBoolean("editor.smooth");
-//    System.out.println(plainFont.getFamily());
-//    System.out.println(plainFont);
 
     // moved from setFont() override (never quite comfortable w/ that override)
     fm = super.getFontMetrics(plainFont);
     tabSize = fm.charWidth(' ') * Preferences.getInteger("editor.tabs.size");
     textArea.recalculateVisibleLines();
-
-//    fgcolor = mode.getColor("editor.fgcolor");
-//    bgcolor = mode.getColor("editor.bgcolor");
   }
 
 
