add cell renderer to usage window

benfry · benfry · commit f3336d835951 · 2017-04-22T20:09:33.000-04:00
diff --git a/app/src/processing/app/ui/ZoomTreeCellRenderer.java b/app/src/processing/app/ui/ZoomTreeCellRenderer.java
@@ -30,7 +30,7 @@
 import processing.app.Mode;
 
 
-class ZoomTreeCellRenderer extends DefaultTreeCellRenderer {
+public class ZoomTreeCellRenderer extends DefaultTreeCellRenderer {
 
   public ZoomTreeCellRenderer(Mode mode) {
     //setFont(Toolkit.getSansFont(Toolkit.zoom(14), Font.PLAIN));
diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/pdex/PDEX.java
@@ -69,7 +69,6 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
 
@@ -82,6 +81,7 @@
 import processing.app.syntax.SyntaxDocument;
 import processing.app.ui.EditorStatus;
 import processing.app.ui.Toolkit;
+import processing.app.ui.ZoomTreeCellRenderer;
 import processing.mode.java.JavaEditor;
 import processing.mode.java.JavaMode;
 import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
@@ -372,7 +372,8 @@ static private class ShowUsage {
       this.pps = pps;
 
       // Add show usage option
-      JMenuItem showUsageItem = new JMenuItem(Language.text("editor.popup.show_usage"));
+      JMenuItem showUsageItem =
+        new JMenuItem(Language.text("editor.popup.show_usage"));
       showUsageItem.addActionListener(e -> handleShowUsage());
       editor.getTextArea().getRightClickPopup().add(showUsageItem);
 
@@ -395,12 +396,14 @@ public void componentShown(ComponentEvent e) {
             pps.registerListener(reloadListener);
           }
         });
-        window.setSize(300, 400);
+        window.setSize(Toolkit.zoom(300, 400));
         window.setFocusableWindowState(false);
         Toolkit.setIcon(window);
         JScrollPane sp2 = new JScrollPane();
         tree = new JTree();
-        DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer) tree.getCellRenderer();
+        ZoomTreeCellRenderer renderer =
+          new ZoomTreeCellRenderer(editor.getMode());
+        tree.setCellRenderer(renderer);
         renderer.setLeafIcon(null);
         renderer.setClosedIcon(null);
         renderer.setOpenIcon(null);
@@ -412,18 +415,16 @@ public void componentShown(ComponentEvent e) {
       }
 
       tree.addTreeSelectionListener(e -> {
-        if (tree.getLastSelectedPathComponent() == null) {
-          return;
-        }
-        DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tree
-            .getLastSelectedPathComponent();
+        if (tree.getLastSelectedPathComponent() != null) {
+          DefaultMutableTreeNode tnode =
+            (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
 
-        if (tnode.getUserObject() instanceof ShowUsageTreeNode) {
-          ShowUsageTreeNode node = (ShowUsageTreeNode) tnode.getUserObject();
-          editor.highlight(node.tabIndex, node.startTabOffset, node.stopTabOffset);
+          if (tnode.getUserObject() instanceof ShowUsageTreeNode) {
+            ShowUsageTreeNode node = (ShowUsageTreeNode) tnode.getUserObject();
+            editor.highlight(node.tabIndex, node.startTabOffset, node.stopTabOffset);
+          }
         }
       });
-
     }
 
 
@@ -935,6 +936,7 @@ public String convertValueToText(Object value, boolean selected,
           return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);
         }
       };
+      tree.setCellRenderer(new ZoomTreeCellRenderer(editor.getMode()));
       window.addComponentListener(new ComponentAdapter() {
         @Override
         public void componentHidden(ComponentEvent e) {
@@ -951,22 +953,20 @@ public void componentHidden(ComponentEvent e) {
       pps.whenDone(updateListener);
       pps.registerListener(updateListener);
 
-
       tree.addTreeSelectionListener(e -> {
-        if (tree.getLastSelectedPathComponent() == null) {
-          return;
-        }
-        DefaultMutableTreeNode tnode =
+        if (tree.getLastSelectedPathComponent() != null) {
+          DefaultMutableTreeNode tnode =
             (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
-        if (tnode.getUserObject() instanceof ASTNode) {
-          ASTNode node = (ASTNode) tnode.getUserObject();
-          pps.whenDone(ps -> {
-            SketchInterval si = ps.mapJavaToSketch(node);
-            if (!ps.inRange(si)) return;
-            EventQueue.invokeLater(() -> {
-              editor.highlight(si.tabIndex, si.startTabOffset, si.stopTabOffset);
+          if (tnode.getUserObject() instanceof ASTNode) {
+            ASTNode node = (ASTNode) tnode.getUserObject();
+            pps.whenDone(ps -> {
+              SketchInterval si = ps.mapJavaToSketch(node);
+              if (!ps.inRange(si)) return;
+              EventQueue.invokeLater(() -> {
+                editor.highlight(si.tabIndex, si.startTabOffset, si.stopTabOffset);
+              });
             });
-          });
+          }
         }
       });
     }
