From 612a6646ac15b05e83eb9916e77b7c3a00f04033 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sat, 22 Apr 2017 19:58:53 -0400
Subject: [PATCH] more work on zoom for examples/sketchbook

---
 app/src/processing/app/ui/ExamplesFrame.java   |  5 ++---
 app/src/processing/app/ui/SketchbookFrame.java | 11 +++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/processing/app/ui/ExamplesFrame.java b/app/src/processing/app/ui/ExamplesFrame.java
index a031492b1..af134f6a3 100644
--- a/app/src/processing/app/ui/ExamplesFrame.java
+++ b/app/src/processing/app/ui/ExamplesFrame.java
@@ -26,7 +26,6 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Cursor;
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -187,8 +186,8 @@ public class ExamplesFrame extends JFrame {
     tree.setCellRenderer(new ZoomTreeCellRenderer(mode));
 
     JScrollPane treePane = new JScrollPane(tree);
-    treePane.setPreferredSize(new Dimension(250, 300));
-    treePane.setBorder(new EmptyBorder(2, 0, 0, 0));
+    treePane.setPreferredSize(Toolkit.zoom(250, 300));
+    treePane.setBorder(new EmptyBorder(Toolkit.zoom(2), 0, 0, 0));
     treePane.setOpaque(true);
     treePane.setBackground(Color.WHITE);
     treePane.setAlignmentX(Component.LEFT_ALIGNMENT);
diff --git a/app/src/processing/app/ui/SketchbookFrame.java b/app/src/processing/app/ui/SketchbookFrame.java
index e1b9ede03..6848c96c8 100644
--- a/app/src/processing/app/ui/SketchbookFrame.java
+++ b/app/src/processing/app/ui/SketchbookFrame.java
@@ -23,7 +23,6 @@
 package processing.app.ui;
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -111,25 +110,29 @@ public class SketchbookFrame extends JFrame {
       }
     });
 
-    tree.setBorder(new EmptyBorder(5, 5, 5, 5));
+    final int border = Toolkit.zoom(5);
+    tree.setBorder(new EmptyBorder(border, border, border, border));
     if (Platform.isMacOS()) {
       tree.setToggleClickCount(2);
     } else {
       tree.setToggleClickCount(1);
     }
 
+    // Special cell renderer that takes the UI zoom into account
+    tree.setCellRenderer(new ZoomTreeCellRenderer(mode));
+
     // Check whether sketch book is empty or not
     TreeModel treeModel = tree.getModel();
     if (treeModel.getChildCount(treeModel.getRoot()) != 0) {
       JScrollPane treePane = new JScrollPane(tree);
-      treePane.setPreferredSize(new Dimension(250, 450));
+      treePane.setPreferredSize(Toolkit.zoom(250, 450));
       treePane.setBorder(new EmptyBorder(0, 0, 0, 0));
       getContentPane().add(treePane);
 
     } else {
       JPanel emptyPanel = new JPanel();
       emptyPanel.setBackground(Color.WHITE);
-      emptyPanel.setPreferredSize(new Dimension(250,450));
+      emptyPanel.setPreferredSize(Toolkit.zoom(250,450));
 
       JLabel emptyLabel = new JLabel("Empty Sketchbook");
       emptyLabel.setForeground(Color.GRAY);