SwingDialog: ignore ENTER for non-modal dialogs

ctrueden · ctrueden · commit d7d29c047f63 · 2018-09-11T10:54:22.000-05:00
See: https://forum.image.sc/t/command-ui-closes-after-pressing-enter-key/19510
diff --git a/src/main/java/org/scijava/ui/swing/SwingDialog.java b/src/main/java/org/scijava/ui/swing/SwingDialog.java
@@ -32,6 +32,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Insets;
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
@@ -203,6 +204,9 @@ public boolean isModal() {
 	public void setModal(final boolean modal) {
 		this.modal = modal;
 		buttons.setVisible(modal);
+
+		// disable the buttons if non-modal, to avoid ENTER closing the dialog.
+		setEnabled(buttons, modal);
 	}
 
 	/** Gets whether the dialog is resizable by the user. */
@@ -351,4 +355,13 @@ public void windowGainedFocus(final WindowEvent e) {
 		});
 	}
 
+	/** Recursively enable or disable components. */
+	private void setEnabled(final Component c, final boolean enabled) {
+		if (c instanceof Container) {
+			for (final Component child : ((Container) c).getComponents()) {
+				setEnabled(child, enabled);
+			}
+		}
+		c.setEnabled(enabled);
+	}
 }
