figuring out tree fonts and spacing to handle ui zoom

benfry · benfry · commit 79d9f4712e66 · 2017-04-22T19:47:08.000-04:00
diff --git a/app/src/processing/app/ui/ExamplesFrame.java b/app/src/processing/app/ui/ExamplesFrame.java
@@ -184,7 +184,7 @@ public void treeCollapsed(TreeExpansionEvent event) {
     }
 
     // Special cell renderer that takes the UI zoom into account
-    tree.setCellRenderer(new ZoomTreeCellRenderer());
+    tree.setCellRenderer(new ZoomTreeCellRenderer(mode));
 
     JScrollPane treePane = new JScrollPane(tree);
     treePane.setPreferredSize(new Dimension(250, 300));
diff --git a/app/src/processing/app/ui/ZoomTreeCellRenderer.java b/app/src/processing/app/ui/ZoomTreeCellRenderer.java
@@ -23,16 +23,18 @@
 package processing.app.ui;
 
 import java.awt.Component;
-import java.awt.Font;
 
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
+import processing.app.Mode;
+
 
 class ZoomTreeCellRenderer extends DefaultTreeCellRenderer {
 
-  public ZoomTreeCellRenderer() {
-    setFont(Toolkit.getSansFont(12, Font.PLAIN));
+  public ZoomTreeCellRenderer(Mode mode) {
+    //setFont(Toolkit.getSansFont(Toolkit.zoom(14), Font.PLAIN));
+    setFont(mode.getFont("tree.font"));
   }
 
 
@@ -48,6 +50,8 @@ public Component getTreeCellRendererComponent(JTree tree, Object value,
     // https://github.com/processing/processing/issues/4936
     int high = getPreferredSize().height;
     if (high != 0) {
+      // add 10% for a little more spacing.. Source Sans leading is short
+      high = (high * 12) / 10;
       int current = getSize().height;
       if (current != high) {
         tree.setRowHeight(high);
diff --git a/build/shared/lib/theme.txt b/build/shared/lib/theme.txt
@@ -168,3 +168,6 @@ manager.tab.update.color = #ed7f15
 manager.tab.gradient.top = #132638
 manager.tab.gradient.bottom = #122535
 manager.tab.background = #132638
+
+# tree for Examples and Sketchbook windows
+tree.font = processing.sans,plain,12

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public void treeCollapsed(TreeExpansionEvent event) {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`// Special cell renderer that takes the UI zoom into account`
`187`		`- tree.setCellRenderer(new ZoomTreeCellRenderer());`
	`187`	`+ tree.setCellRenderer(new ZoomTreeCellRenderer(mode));`
`188`	`188`
`189`	`189`	`JScrollPane treePane = new JScrollPane(tree);`
`190`	`190`	`treePane.setPreferredSize(new Dimension(250, 300));`