more work on zoom for examples/sketchbook

This commit is contained in:
Ben Fry
2017-04-22 19:58:53 -04:00
parent c116d2b08b
commit 612a6646ac
2 changed files with 9 additions and 7 deletions
+2 -3
View File
@@ -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);
@@ -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);