From ee6a1da70981ccbb991a93ff23f481dfdb49227c Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Tue, 15 Sep 2020 13:44:00 +0200
Subject: [PATCH] Demo: exit even if UI defaults inspector window is shown

---
 .../main/java/com/formdev/flatlaf/demo/DemoFrame.java | 11 +++++++++--
 .../main/java/com/formdev/flatlaf/demo/DemoFrame.jfd  |  2 +-
 .../com/formdev/flatlaf/testing/FlatTestFrame.java    |  9 ++++++++-
 .../com/formdev/flatlaf/testing/FlatTestFrame.jfd     |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
index 8100f140..442f23ae 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
@@ -69,6 +69,13 @@ class DemoFrame
 		} );
 	}
 
+	@Override
+	public void dispose() {
+		super.dispose();
+
+		System.exit( 0 );
+	}
+
 	private void showHints() {
 		Hint fontMenuHint = new Hint(
 			"Use 'Font' menu to increase/decrease font size or try different fonts.",
@@ -109,7 +116,7 @@ class DemoFrame
 	}
 
 	private void exitActionPerformed() {
-		System.exit( 0 );
+		dispose();
 	}
 
 	private void aboutActionPerformed() {
@@ -337,7 +344,7 @@ class DemoFrame
 
 		//======== this ========
 		setTitle("FlatLaf Demo");
-		setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		Container contentPane = getContentPane();
 		contentPane.setLayout(new BorderLayout());
 
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
index f7cb04af..04acdfaf 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
@@ -9,7 +9,7 @@ new FormModel {
 		add( new FormWindow( "javax.swing.JFrame", new FormLayoutManager( class java.awt.BorderLayout ) ) {
 			name: "this"
 			"title": "FlatLaf Demo"
-			"defaultCloseOperation": 3
+			"defaultCloseOperation": 2
 			"$locationPolicy": 2
 			"$sizePolicy": 2
 			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
index 56db726e..3f702165 100644
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
@@ -253,6 +253,13 @@ public class FlatTestFrame
 		} );
 	}
 
+	@Override
+	public void dispose() {
+		super.dispose();
+
+		System.exit( 0 );
+	}
+
 	private void updateTitle() {
 		double systemScaleFactor = UIScale.getSystemScaleFactor( getGraphicsConfiguration() );
 		float userScaleFactor = UIScale.getUserScaleFactor();
@@ -637,7 +644,7 @@ public class FlatTestFrame
 		themesPanel = new IJThemesPanel();
 
 		//======== this ========
-		setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		Container contentPane = getContentPane();
 		contentPane.setLayout(new BorderLayout());
 
diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
index 8e84a681..e174c4d5 100644
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
@@ -7,7 +7,7 @@ new FormModel {
 			name: "this"
 			"$locationPolicy": 2
 			"$sizePolicy": 2
-			"defaultCloseOperation": 3
+			"defaultCloseOperation": 2
 			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
 				name: "dialogPane"
 				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {