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

Button, ComboBox, TextField and DatePicker UI delegates now get Component.focusWidth and Button.arc/Component.arc/TextComponent.arc from component border

Browse Source
This commit is contained in:
Karl Tauber
2020-05-15 11:32:53 +02:00
parent 578d445ecb
commit 26c77b3118
12 changed files with 64 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java
View File

@@ -83,8 +83,6 @@ public class FlatComponentsTest
JButton button15 = new JButton();
JButton button16 = new JButton();
JButton button20 = new JButton();
JButton button24 = new JButton();
JButton button25 = new JButton();
JLabel toggleButtonLabel = new JLabel();
JToggleButton toggleButton1 = new JToggleButton();
JToggleButton toggleButton9 = new JToggleButton();
@@ -99,8 +97,6 @@ public class FlatComponentsTest
JToggleButton toggleButton13 = new JToggleButton();
JToggleButton toggleButton14 = new JToggleButton();
JToggleButton toggleButton18 = new JToggleButton();
JToggleButton toggleButton21 = new JToggleButton();
JToggleButton toggleButton22 = new JToggleButton();
JLabel checkBoxLabel = new JLabel();
JCheckBox checkBox1 = new JCheckBox();
JCheckBox checkBox2 = new JCheckBox();
@@ -375,18 +371,6 @@ public class FlatComponentsTest
button20.setBorder(BorderFactory.createEmptyBorder());
add(button20, "cell 6 1");
//---- button24 ----
button24.setText("sq");
button24.setBorder(BorderFactory.createEmptyBorder());
button24.putClientProperty("JButton.buttonType", "square");
add(button24, "cell 6 1");
//---- button25 ----
button25.setText("rd");
button25.setBorder(new EmptyBorder(0, 10, 0, 10));
button25.putClientProperty("JButton.buttonType", "roundRect");
add(button25, "cell 6 1");
//---- toggleButtonLabel ----
toggleButtonLabel.setText("JToggleButton:");
add(toggleButtonLabel, "cell 0 2");
@@ -458,18 +442,6 @@ public class FlatComponentsTest
toggleButton18.setBorder(BorderFactory.createEmptyBorder());
add(toggleButton18, "cell 6 2");
//---- toggleButton21 ----
toggleButton21.setText("sq");
toggleButton21.setBorder(BorderFactory.createEmptyBorder());
toggleButton21.putClientProperty("JButton.buttonType", "square");
add(toggleButton21, "cell 6 2");
//---- toggleButton22 ----
toggleButton22.setText("rd");
toggleButton22.setBorder(new EmptyBorder(0, 10, 0, 10));
toggleButton22.putClientProperty("JButton.buttonType", "roundRect");
add(toggleButton22, "cell 6 2");
//---- checkBoxLabel ----
checkBoxLabel.setText("JCheckBox");
add(checkBoxLabel, "cell 0 3");

32
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd
View File

@@ -144,22 +144,6 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 6 1"
} )
add( new FormComponent( "javax.swing.JButton" ) {
name: "button24"
"text": "sq"
"border": #EmptyBorder0
"$client.JButton.buttonType": "square"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 6 1"
} )
add( new FormComponent( "javax.swing.JButton" ) {
name: "button25"
"text": "rd"
"border": &EmptyBorder1 new javax.swing.border.EmptyBorder( 0, 10, 0, 10 )
"$client.JButton.buttonType": "roundRect"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 6 1"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "toggleButtonLabel"
"text": "JToggleButton:"
@@ -259,22 +243,6 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 6 2"
} )
add( new FormComponent( "javax.swing.JToggleButton" ) {
name: "toggleButton21"
"text": "sq"
"border": #EmptyBorder0
"$client.JButton.buttonType": "square"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 6 2"
} )
add( new FormComponent( "javax.swing.JToggleButton" ) {
name: "toggleButton22"
"text": "rd"
"border": #EmptyBorder1
"$client.JButton.buttonType": "roundRect"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 6 2"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "checkBoxLabel"
"text": "JCheckBox"