From 172a8a1b3970ec8a2de41db141b19a4294fefc02 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sun, 8 Sep 2019 19:09:39 +0200
Subject: [PATCH] TitledBorder: fixed border and added to Demo

---
 .../resources/com/formdev/flatlaf/FlatLaf.properties     | 1 +
 .../java/com/formdev/flatlaf/FlatComponentsTest.java     | 9 +++++++++
 .../test/java/com/formdev/flatlaf/FlatComponentsTest.jfd | 6 ++++++
 .../resources/com/formdev/flatlaf/FlatTestLaf.properties | 1 +
 .../com/formdev/flatlaf/demo/MoreComponentsPanel.java    | 9 +++++++++
 .../com/formdev/flatlaf/demo/MoreComponentsPanel.jfd     | 6 ++++++
 6 files changed, 32 insertions(+)

diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
index 4b5a1a5a..0e7352b8 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -298,6 +298,7 @@ TextPane.margin=@textComponentMargin
 #---- TitledBorder ----
 
 TitledBorder.titleColor=@foreground
+TitledBorder.border=1,1,1,1,@@Separator.foreground
 
 
 #---- ToggleButton ----
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
index bce69b9f..32faaf75 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
@@ -18,6 +18,7 @@ package com.formdev.flatlaf;
 
 import java.awt.*;
 import javax.swing.*;
+import javax.swing.border.*;
 import net.miginfocom.swing.*;
 
 /**
@@ -141,6 +142,7 @@ public class FlatComponentsTest
 		JScrollBar scrollBar4 = new JScrollBar();
 		JLabel separatorLabel = new JLabel();
 		JSeparator separator1 = new JSeparator();
+		JPanel panel2 = new JPanel();
 		JLabel sliderLabel = new JLabel();
 		JSlider slider1 = new JSlider();
 		JSlider slider6 = new JSlider();
@@ -697,6 +699,13 @@ public class FlatComponentsTest
 		add(separatorLabel, "cell 0 16");
 		add(separator1, "cell 1 16,growx");
 
+		//======== panel2 ========
+		{
+			panel2.setBorder(new TitledBorder("TitledBorder"));
+			panel2.setLayout(new FlowLayout());
+		}
+		add(panel2, "cell 3 16,grow");
+
 		//---- sliderLabel ----
 		sliderLabel.setText("JSlider:");
 		add(sliderLabel, "cell 0 17");
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd
index c0051bc2..9ca1f460 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd
@@ -662,6 +662,12 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 16,growx"
 			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.FlowLayout ) ) {
+				name: "panel2"
+				"border": new javax.swing.border.TitledBorder( "TitledBorder" )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 3 16,grow"
+			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "sliderLabel"
 				"text": "JSlider:"
diff --git a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
index 4a03a2e3..fb1ea527 100644
--- a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
+++ b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
@@ -214,6 +214,7 @@ TableHeader.bottomSeparatorColor=00ff00
 #---- TitledBorder ----
 
 TitledBorder.titleColor=ff00ff
+TitledBorder.border=1,1,1,1,ff00ff
 
 
 #---- ToggleButton ----
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java
index f2765240..3a0c7c7b 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java
@@ -18,6 +18,7 @@ package com.formdev.flatlaf.demo;
 
 import java.awt.*;
 import javax.swing.*;
+import javax.swing.border.*;
 import net.miginfocom.swing.*;
 
 /**
@@ -61,6 +62,7 @@ class MoreComponentsPanel
 		JScrollBar scrollBar4 = new JScrollBar();
 		JLabel separatorLabel = new JLabel();
 		JSeparator separator1 = new JSeparator();
+		JPanel panel2 = new JPanel();
 		JLabel sliderLabel = new JLabel();
 		JSlider slider1 = new JSlider();
 		JSlider slider6 = new JSlider();
@@ -195,6 +197,13 @@ class MoreComponentsPanel
 		add(separatorLabel, "cell 0 3");
 		add(separator1, "cell 1 3,growx");
 
+		//======== panel2 ========
+		{
+			panel2.setBorder(new TitledBorder("TitledBorder"));
+			panel2.setLayout(new FlowLayout());
+		}
+		add(panel2, "cell 3 3,grow");
+
 		//---- sliderLabel ----
 		sliderLabel.setText("JSlider:");
 		add(sliderLabel, "cell 0 4");
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.jfd
index 6618da34..5e06e61a 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.jfd
@@ -145,6 +145,12 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 3,growx"
 			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.FlowLayout ) ) {
+				name: "panel2"
+				"border": new javax.swing.border.TitledBorder( "TitledBorder" )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 3 3,grow"
+			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "sliderLabel"
 				"text": "JSlider:"