angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 22:47:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

TitledBorder: fixed border and added to Demo

Browse Source
This commit is contained in:
Karl Tauber
2019-09-08 19:09:39 +02:00
parent e6de6b565b
commit 172a8a1b39
6 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -298,6 +298,7 @@ TextPane.margin=@textComponentMargin
#---- TitledBorder ---- #---- TitledBorder ----
TitledBorder.titleColor=@foreground TitledBorder.titleColor=@foreground
TitledBorder.border=1,1,1,1,@@Separator.foreground
#---- ToggleButton ---- #---- ToggleButton ----

9
flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
View File

@@ -18,6 +18,7 @@ package com.formdev.flatlaf;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.*;
import net.miginfocom.swing.*; import net.miginfocom.swing.*;
/** /**
@@ -141,6 +142,7 @@ public class FlatComponentsTest
JScrollBar scrollBar4 = new JScrollBar(); JScrollBar scrollBar4 = new JScrollBar();
JLabel separatorLabel = new JLabel(); JLabel separatorLabel = new JLabel();
JSeparator separator1 = new JSeparator(); JSeparator separator1 = new JSeparator();
JPanel panel2 = new JPanel();
JLabel sliderLabel = new JLabel(); JLabel sliderLabel = new JLabel();
JSlider slider1 = new JSlider(); JSlider slider1 = new JSlider();
JSlider slider6 = new JSlider(); JSlider slider6 = new JSlider();
@@ -697,6 +699,13 @@ public class FlatComponentsTest
add(separatorLabel, "cell 0 16"); add(separatorLabel, "cell 0 16");
add(separator1, "cell 1 16,growx"); add(separator1, "cell 1 16,growx");
//======== panel2 ========
{
panel2.setBorder(new TitledBorder("TitledBorder"));
panel2.setLayout(new FlowLayout());
}
add(panel2, "cell 3 16,grow");
//---- sliderLabel ---- //---- sliderLabel ----
sliderLabel.setText("JSlider:"); sliderLabel.setText("JSlider:");
add(sliderLabel, "cell 0 17"); add(sliderLabel, "cell 0 17");

6
flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd
View File

@@ -662,6 +662,12 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 16,growx" "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" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "sliderLabel" name: "sliderLabel"
"text": "JSlider:" "text": "JSlider:"

1
flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
View File

@@ -214,6 +214,7 @@ TableHeader.bottomSeparatorColor=00ff00
#---- TitledBorder ---- #---- TitledBorder ----
TitledBorder.titleColor=ff00ff TitledBorder.titleColor=ff00ff
TitledBorder.border=1,1,1,1,ff00ff
#---- ToggleButton ---- #---- ToggleButton ----

9
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java
View File

@@ -18,6 +18,7 @@ package com.formdev.flatlaf.demo;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.*;
import net.miginfocom.swing.*; import net.miginfocom.swing.*;
/** /**
@@ -61,6 +62,7 @@ class MoreComponentsPanel
JScrollBar scrollBar4 = new JScrollBar(); JScrollBar scrollBar4 = new JScrollBar();
JLabel separatorLabel = new JLabel(); JLabel separatorLabel = new JLabel();
JSeparator separator1 = new JSeparator(); JSeparator separator1 = new JSeparator();
JPanel panel2 = new JPanel();
JLabel sliderLabel = new JLabel(); JLabel sliderLabel = new JLabel();
JSlider slider1 = new JSlider(); JSlider slider1 = new JSlider();
JSlider slider6 = new JSlider(); JSlider slider6 = new JSlider();
@@ -195,6 +197,13 @@ class MoreComponentsPanel
add(separatorLabel, "cell 0 3"); add(separatorLabel, "cell 0 3");
add(separator1, "cell 1 3,growx"); add(separator1, "cell 1 3,growx");
//======== panel2 ========
{
panel2.setBorder(new TitledBorder("TitledBorder"));
panel2.setLayout(new FlowLayout());
}
add(panel2, "cell 3 3,grow");
//---- sliderLabel ---- //---- sliderLabel ----
sliderLabel.setText("JSlider:"); sliderLabel.setText("JSlider:");
add(sliderLabel, "cell 0 4"); add(sliderLabel, "cell 0 4");

6
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.jfd
View File

@@ -145,6 +145,12 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 3,growx" "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" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "sliderLabel" name: "sliderLabel"
"text": "JSlider:" "text": "JSlider:"