notes about #5246

benfry · benfry · commit a30d168f2aed · 2018-04-07T10:41:11.000-04:00
diff --git a/app/src/processing/app/ui/ZoomTreeCellRenderer.java b/app/src/processing/app/ui/ZoomTreeCellRenderer.java
@@ -33,7 +33,6 @@
 public class ZoomTreeCellRenderer extends DefaultTreeCellRenderer {
 
   public ZoomTreeCellRenderer(Mode mode) {
-    //setFont(Toolkit.getSansFont(Toolkit.zoom(14), Font.PLAIN));
     setFont(mode.getFont("tree.font"));
   }
 
@@ -50,10 +49,12 @@ public Component getTreeCellRendererComponent(JTree tree, Object value,
     // https://github.com/processing/processing/issues/4936
     int high = getPreferredSize().height;
     if (high != 0) {
-      // add 15% for a little more spacing.. Source Sans leading is short
+      // Source Sans leading too short, so also add 15% for nicer spacing
       high = (int) (high * 1.15f);
       int current = getSize().height;
       if (current != high) {
+        // This seems to be causing an infinite loop on Windows
+        // https://github.com/processing/processing/issues/5246
         tree.setRowHeight(high);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`public class ZoomTreeCellRenderer extends DefaultTreeCellRenderer {`
`34`	`34`
`35`	`35`	`public ZoomTreeCellRenderer(Mode mode) {`
`36`		`- //setFont(Toolkit.getSansFont(Toolkit.zoom(14), Font.PLAIN));`
`37`	`36`	`setFont(mode.getFont("tree.font"));`
`38`	`37`	`}`
`39`	`38`
`@@ -50,10 +49,12 @@ public Component getTreeCellRendererComponent(JTree tree, Object value,`
`50`	`49`	`// https://github.com/processing/processing/issues/4936`
`51`	`50`	`int high = getPreferredSize().height;`
`52`	`51`	`if (high != 0) {`
`53`		`- // add 15% for a little more spacing.. Source Sans leading is short`
	`52`	`+ // Source Sans leading too short, so also add 15% for nicer spacing`
`54`	`53`	`high = (int) (high * 1.15f);`
`55`	`54`	`int current = getSize().height;`
`56`	`55`	`if (current != high) {`
	`56`	`+ // This seems to be causing an infinite loop on Windows`
	`57`	`+ // https://github.com/processing/processing/issues/5246`
`57`	`58`	`tree.setRowHeight(high);`
`58`	`59`	`}`
`59`	`60`	`}`