fix rename dialog scaling for high density (fixes processing#5368)

benfry · benfry · commit e2b1c380f6d2 · 2018-03-13T19:36:48.000-04:00
diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/pdex/PDEX.java
@@ -18,7 +18,6 @@
 import org.eclipse.jdt.core.dom.VariableDeclaration;
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -648,9 +647,7 @@ public String toString() {
   }
 
 
-
   private class Rename {
-
     final JDialog window;
     final JTextField textField;
     final JLabel oldNameLabel;
@@ -684,26 +681,28 @@ public void componentHidden(ComponentEvent e) {
           ps = null;
         }
       });
-      window.setSize(250, 130);
+      window.setSize(Toolkit.zoom(250, 130));
       window.setLayout(new BoxLayout(window.getContentPane(), BoxLayout.Y_AXIS));
       Toolkit.setIcon(window);
 
+      final int b = Toolkit.zoom(5);
+
       { // Top panel
 
         // Text field
         textField = new JTextField();
-        textField.setPreferredSize(new Dimension(150, 60));
+        textField.setPreferredSize(Toolkit.zoom(150, 60));
 
         // Old name label
         oldNameLabel = new JLabel();
-        oldNameLabel.setText("Old Name: ");
+        oldNameLabel.setText("Current Name: ");
 
         // Top panel
         JPanel panelTop = new JPanel();
         panelTop.setLayout(new BoxLayout(panelTop, BoxLayout.Y_AXIS));
-        panelTop.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        panelTop.setBorder(BorderFactory.createEmptyBorder(b, b, b, b));
         panelTop.add(textField);
-        panelTop.add(Box.createRigidArea(new Dimension(0, 10)));
+        panelTop.add(Box.createRigidArea(Toolkit.zoom(0, 10)));
         panelTop.add(oldNameLabel);
         window.add(panelTop);
       }
@@ -717,28 +716,27 @@ public void componentHidden(ComponentEvent e) {
 
         JButton renameButton = new JButton("Rename");
         renameButton.addActionListener(e -> {
-          if (textField.getText().length() == 0) {
-            return;
-          }
-          String newName = textField.getText().trim();
-          boolean isNewNameValid = newName.length() >= 1 &&
-              newName.chars().limit(1).allMatch(Character::isUnicodeIdentifierStart) &&
-              newName.chars().skip(1).allMatch(Character::isUnicodeIdentifierPart);
-          if (!isNewNameValid) {
-            JOptionPane.showMessageDialog(new JFrame(), "'" + newName
-                + "' isn't a valid name.", "Uh oh..", JOptionPane.PLAIN_MESSAGE);
-          } else {
-            rename(ps, binding, newName);
-            window.setVisible(false);
+          final String newName = textField.getText().trim();
+          if (!newName.isEmpty()) {
+            if (newName.length() >= 1 &&
+                newName.chars().limit(1).allMatch(Character::isUnicodeIdentifierStart) &&
+                newName.chars().skip(1).allMatch(Character::isUnicodeIdentifierPart)) {
+              rename(ps, binding, newName);
+              window.setVisible(false);
+            } else {
+              String msg = String.format("'%s' is not a valid name", newName);
+              JOptionPane.showMessageDialog(editor, msg, "Naming is Hard",
+                                            JOptionPane.PLAIN_MESSAGE);
+            }
           }
         });
 
         JPanel panelBottom = new JPanel();
         panelBottom.setLayout(new BoxLayout(panelBottom, BoxLayout.X_AXIS));
-        panelBottom.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        panelBottom.setBorder(BorderFactory.createEmptyBorder(b, b, b, b));
         panelBottom.add(Box.createHorizontalGlue());
         panelBottom.add(showUsageButton);
-        panelBottom.add(Box.createRigidArea(new Dimension(15, 0)));
+        panelBottom.add(Box.createRigidArea(Toolkit.zoom(15, 0)));
         panelBottom.add(renameButton);
         window.add(panelBottom);
       }
diff --git a/todo.txt b/todo.txt
@@ -12,6 +12,8 @@ X include newlines at end of files (i.e. when saving .pde files)
 X   https://github.com/processing/processing/issues/5327
 X   explanation: https://stackoverflow.com/a/729795
 X   http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
+X Rename dialog is unusable on high density screen
+X   https://github.com/processing/processing/issues/5368
 
 jakub
 X Fix scrub comments for empty block comment /**/
@@ -58,8 +60,6 @@ _   https://github.com/processing/processing/issues/3911
 
 _ windows defender blocks processing 3.3.6
 _   https://github.com/processing/processing/issues/5329
-_ Rename dialog is unusable on high density screen
-_   https://github.com/processing/processing/issues/5368
 _ Manager fails to complete install of PythonMode when no windows open
 _   https://github.com/processing/processing/issues/5309
 _ update to launch4j 3.11? 
