Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 06:20:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Demo:

Browse Source 
- "Data components" tab: increase component height if frame is made larger
- "SplitPane & Tabs" tab: increased some gaps and renamed TabbedPane option checkboxes
- "Option Pane" and "Extras" tabs: minor layout improvements
This commit is contained in:
Karl Tauber
2020-09-02 19:08:24 +02:00
parent ec8213b891
commit 3cc9c98040
14 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java
View File

@@ -89,20 +89,20 @@ class DataComponentsPanel
//======== this ======== //======== this ========
setLayout(new MigLayout( setLayout(new MigLayout(
"hidemode 3", "insets dialog,hidemode 3",
// columns // columns
"[]" + "[]" +
"[200]" + "[200,fill]" +
"[200]", "[200,fill]",
// rows // rows
"[]" + "[150,grow,sizegroup 1,fill]" +
"[::200]" + "[150,grow,sizegroup 1,fill]" +
"[::150]" + "[150,grow,sizegroup 1,fill]" +
"[]")); "[]"));
//---- listLabel ---- //---- listLabel ----
listLabel.setText("JList:"); listLabel.setText("JList:");
add(listLabel, "cell 0 0"); add(listLabel, "cell 0 0,aligny top,growy 0");
//======== scrollPane1 ======== //======== scrollPane1 ========
{ {
@@ -134,7 +134,7 @@ class DataComponentsPanel
list1.setComponentPopupMenu(popupMenu2); list1.setComponentPopupMenu(popupMenu2);
scrollPane1.setViewportView(list1); scrollPane1.setViewportView(list1);
} }
add(scrollPane1, "cell 1 0,growx"); add(scrollPane1, "cell 1 0");
//======== scrollPane2 ======== //======== scrollPane2 ========
{ {
@@ -166,11 +166,11 @@ class DataComponentsPanel
list2.setEnabled(false); list2.setEnabled(false);
scrollPane2.setViewportView(list2); scrollPane2.setViewportView(list2);
} }
add(scrollPane2, "cell 2 0,growx"); add(scrollPane2, "cell 2 0");
//---- treeLabel ---- //---- treeLabel ----
treeLabel.setText("JTree:"); treeLabel.setText("JTree:");
add(treeLabel, "cell 0 1"); add(treeLabel, "cell 0 1,aligny top,growy 0");
//======== scrollPane3 ======== //======== scrollPane3 ========
{ {
@@ -207,7 +207,7 @@ class DataComponentsPanel
tree1.setComponentPopupMenu(popupMenu2); tree1.setComponentPopupMenu(popupMenu2);
scrollPane3.setViewportView(tree1); scrollPane3.setViewportView(tree1);
} }
add(scrollPane3, "cell 1 1,growx"); add(scrollPane3, "cell 1 1");
//======== scrollPane4 ======== //======== scrollPane4 ========
{ {
@@ -216,11 +216,11 @@ class DataComponentsPanel
tree2.setEnabled(false); tree2.setEnabled(false);
scrollPane4.setViewportView(tree2); scrollPane4.setViewportView(tree2);
} }
add(scrollPane4, "cell 2 1,growx"); add(scrollPane4, "cell 2 1");
//---- tableLabel ---- //---- tableLabel ----
tableLabel.setText("JTable:"); tableLabel.setText("JTable:");
add(tableLabel, "cell 0 2"); add(tableLabel, "cell 0 2,aligny top,growy 0");
//======== scrollPane5 ======== //======== scrollPane5 ========
{ {
@@ -297,7 +297,7 @@ class DataComponentsPanel
table1.setComponentPopupMenu(popupMenu2); table1.setComponentPopupMenu(popupMenu2);
scrollPane5.setViewportView(table1); scrollPane5.setViewportView(table1);
} }
add(scrollPane5, "cell 1 2 2 1,growx,width 300"); add(scrollPane5, "cell 1 2 2 1,width 300");
//---- dndCheckBox ---- //---- dndCheckBox ----
dndCheckBox.setText("enable drag and drop"); dndCheckBox.setText("enable drag and drop");

24
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.jfd
View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8" JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
@@ -7,16 +7,16 @@ new FormModel {
"JavaCodeGenerator.defaultVariableLocal": true "JavaCodeGenerator.defaultVariableLocal": true
} }
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "hidemode 3" "$layoutConstraints": "insets dialog,hidemode 3"
"$columnConstraints": "[][200][200]" "$columnConstraints": "[][200,fill][200,fill]"
"$rowConstraints": "[][::200][::150][]" "$rowConstraints": "[150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][]"
} ) { } ) {
name: "this" name: "this"
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "listLabel" name: "listLabel"
"text": "JList:" "text": "JList:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 0" "value": "cell 0 0,aligny top,growy 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane1" name: "scrollPane1"
@@ -46,7 +46,7 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 0,growx" "value": "cell 1 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane2" name: "scrollPane2"
@@ -76,13 +76,13 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 0,growx" "value": "cell 2 0"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "treeLabel" name: "treeLabel"
"text": "JTree:" "text": "JTree:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 1" "value": "cell 0 1,aligny top,growy 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane3" name: "scrollPane3"
@@ -150,7 +150,7 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 1,growx" "value": "cell 1 1"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane4" name: "scrollPane4"
@@ -162,13 +162,13 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 1,growx" "value": "cell 2 1"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "tableLabel" name: "tableLabel"
"text": "JTable:" "text": "JTable:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 2" "value": "cell 0 2,aligny top,growy 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane5" name: "scrollPane5"
@@ -307,7 +307,7 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 2 2 1,growx,width 300" "value": "cell 1 2 2 1,width 300"
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "dndCheckBox" name: "dndCheckBox"

2
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
View File

@@ -93,7 +93,7 @@ class OptionPanePanel
//======== panel9 ======== //======== panel9 ========
{ {
panel9.setLayout(new MigLayout( panel9.setLayout(new MigLayout(
"flowy,hidemode 3", "flowy,insets dialog,hidemode 3",
// columns // columns
"[]" + "[]" +
"[]" + "[]" +

4
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd
View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8" JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
@@ -12,7 +12,7 @@ new FormModel {
name: "scrollPane1" name: "scrollPane1"
"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 ) "border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
add( new FormContainer( "com.formdev.flatlaf.demo.ScrollablePanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { add( new FormContainer( "com.formdev.flatlaf.demo.ScrollablePanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "flowy,hidemode 3" "$layoutConstraints": "flowy,insets dialog,hidemode 3"
"$columnConstraints": "[][][fill]" "$columnConstraints": "[][][fill]"
"$rowConstraints": "[top][top][top][top][top][top][top][top]" "$rowConstraints": "[top][top][top][top][top][top][top][top]"
} ) { } ) {

14
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java
View File

@@ -111,7 +111,7 @@ class TabsPanel
//======== this ======== //======== this ========
setLayout(new MigLayout( setLayout(new MigLayout(
"hidemode 3", "insets dialog,hidemode 3",
// columns // columns
"[grow,fill]", "[grow,fill]",
// rows // rows
@@ -120,8 +120,8 @@ class TabsPanel
//======== panel9 ======== //======== panel9 ========
{ {
panel9.setLayout(new FormLayout( panel9.setLayout(new FormLayout(
"70dlu:grow, $lcgap, 70dlu:grow", "70dlu:grow, $ugap, 70dlu:grow",
"default, $lgap, fill:70dlu, $lgap, pref, 2*($lgap, fill:70dlu:grow), $lgap, pref")); "default, $lgap, fill:70dlu, $pgap, pref, $lgap, 2*(fill:70dlu:grow, $ugap), pref"));
//---- splitPaneLabel ---- //---- splitPaneLabel ----
splitPaneLabel.setText("JSplitPane:"); splitPaneLabel.setText("JSplitPane:");
@@ -301,24 +301,24 @@ class TabsPanel
"[center]")); "[center]"));
//---- moreTabsCheckBox ---- //---- moreTabsCheckBox ----
moreTabsCheckBox.setText("more tabs"); moreTabsCheckBox.setText("More tabs");
moreTabsCheckBox.setMnemonic('M'); moreTabsCheckBox.setMnemonic('M');
moreTabsCheckBox.addActionListener(e -> moreTabsChanged()); moreTabsCheckBox.addActionListener(e -> moreTabsChanged());
panel14.add(moreTabsCheckBox, "cell 0 0"); panel14.add(moreTabsCheckBox, "cell 0 0");
//---- tabScrollCheckBox ---- //---- tabScrollCheckBox ----
tabScrollCheckBox.setText("tabLayoutPolicy = SCROLL"); tabScrollCheckBox.setText("Use scroll layout");
tabScrollCheckBox.setMnemonic('S'); tabScrollCheckBox.setMnemonic('S');
tabScrollCheckBox.addActionListener(e -> tabScrollChanged()); tabScrollCheckBox.addActionListener(e -> tabScrollChanged());
panel14.add(tabScrollCheckBox, "cell 1 0,alignx left,growx 0"); panel14.add(tabScrollCheckBox, "cell 1 0,alignx left,growx 0");
//---- showTabSeparatorsCheckBox ---- //---- showTabSeparatorsCheckBox ----
showTabSeparatorsCheckBox.setText("JTabbedPane.showTabSeparators"); showTabSeparatorsCheckBox.setText("Show tab separators");
showTabSeparatorsCheckBox.addActionListener(e -> showTabSeparatorsChanged()); showTabSeparatorsCheckBox.addActionListener(e -> showTabSeparatorsChanged());
panel14.add(showTabSeparatorsCheckBox, "cell 2 0"); panel14.add(showTabSeparatorsCheckBox, "cell 2 0");
//---- hasFullBorderCheckBox ---- //---- hasFullBorderCheckBox ----
hasFullBorderCheckBox.setText("JTabbedPane.hasFullBorder"); hasFullBorderCheckBox.setText("Show full border");
hasFullBorderCheckBox.setMnemonic('F'); hasFullBorderCheckBox.setMnemonic('F');
hasFullBorderCheckBox.addActionListener(e -> hasFullBorderChanged()); hasFullBorderCheckBox.addActionListener(e -> hasFullBorderChanged());
panel14.add(hasFullBorderCheckBox, "cell 3 0,alignx left,growx 0"); panel14.add(hasFullBorderCheckBox, "cell 3 0,alignx left,growx 0");

16
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.jfd
View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8" JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
@@ -7,14 +7,14 @@ new FormModel {
"JavaCodeGenerator.defaultVariableLocal": true "JavaCodeGenerator.defaultVariableLocal": true
} }
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "hidemode 3" "$layoutConstraints": "insets dialog,hidemode 3"
"$columnConstraints": "[grow,fill]" "$columnConstraints": "[grow,fill]"
"$rowConstraints": "[grow,fill]" "$rowConstraints": "[grow,fill]"
} ) { } ) {
name: "this" name: "this"
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) {
"$columnSpecs": "70dlu:grow, labelcompgap, 70dlu:grow" "$columnSpecs": "70dlu:grow, unrelgap, 70dlu:grow"
"$rowSpecs": "default, linegap, fill:70dlu, linegap, pref, linegap, fill:70dlu:grow, linegap, fill:70dlu:grow, linegap, pref" "$rowSpecs": "default, linegap, fill:70dlu, pargap, pref, linegap, fill:70dlu:grow, unrelgap, fill:70dlu:grow, unrelgap, pref"
} ) { } ) {
name: "panel9" name: "panel9"
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
@@ -205,7 +205,7 @@ new FormModel {
name: "panel14" name: "panel14"
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "moreTabsCheckBox" name: "moreTabsCheckBox"
"text": "more tabs" "text": "More tabs"
"mnemonic": 77 "mnemonic": 77
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false
@@ -216,7 +216,7 @@ new FormModel {
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "tabScrollCheckBox" name: "tabScrollCheckBox"
"text": "tabLayoutPolicy = SCROLL" "text": "Use scroll layout"
"mnemonic": 83 "mnemonic": 83
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false
@@ -227,7 +227,7 @@ new FormModel {
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "showTabSeparatorsCheckBox" name: "showTabSeparatorsCheckBox"
"text": "JTabbedPane.showTabSeparators" "text": "Show tab separators"
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false
} }
@@ -237,7 +237,7 @@ new FormModel {
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "hasFullBorderCheckBox" name: "hasFullBorderCheckBox"
"text": "JTabbedPane.hasFullBorder" "text": "Show full border"
"mnemonic": 70 "mnemonic": 70
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false

4
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.java
View File

@@ -71,7 +71,7 @@ public class ExtrasPanel
//======== this ======== //======== this ========
setLayout(new MigLayout( setLayout(new MigLayout(
"hidemode 3", "insets dialog,hidemode 3",
// columns // columns
"[]" + "[]" +
"[]" + "[]" +
@@ -98,7 +98,7 @@ public class ExtrasPanel
//---- triStateLabel1 ---- //---- triStateLabel1 ----
triStateLabel1.setText("text"); triStateLabel1.setText("text");
triStateLabel1.setEnabled(false); triStateLabel1.setEnabled(false);
add(triStateLabel1, "cell 2 1"); add(triStateLabel1, "cell 2 1,gapx 30");
//---- label2 ---- //---- label2 ----
label2.setText("SVG Icons:"); label2.setText("SVG Icons:");

4
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.jfd
View File

@@ -4,7 +4,7 @@ new FormModel {
contentType: "form/swing" contentType: "form/swing"
root: new FormRoot { root: new FormRoot {
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "hidemode 3" "$layoutConstraints": "insets dialog,hidemode 3"
"$columnConstraints": "[][][left]" "$columnConstraints": "[][][left]"
"$rowConstraints": "[]para[][][]" "$rowConstraints": "[]para[][][]"
} ) { } ) {
@@ -33,7 +33,7 @@ new FormModel {
"text": "text" "text": "text"
"enabled": false "enabled": false
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 1" "value": "cell 2 1,gapx 30"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "label2" name: "label2"

26
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java
View File

@@ -154,13 +154,13 @@ public class FlatComponents2Test
"ltr,insets dialog,hidemode 3", "ltr,insets dialog,hidemode 3",
// columns // columns
"[]" + "[]" +
"[200]" + "[200,fill]" +
"[200]", "[200,fill]",
// rows // rows
"[]" + "[]" +
"[]" + "[150,grow,sizegroup 1,fill]" +
"[::200]" + "[150,grow,sizegroup 1,fill]" +
"[150,grow]" + "[150,grow,sizegroup 1,fill]" +
"[]" + "[]" +
"[]")); "[]"));
@@ -179,7 +179,7 @@ public class FlatComponents2Test
//---- listLabel ---- //---- listLabel ----
listLabel.setText("JList:"); listLabel.setText("JList:");
add(listLabel, "cell 0 1"); add(listLabel, "cell 0 1,aligny top,growy 0");
//======== scrollPane1 ======== //======== scrollPane1 ========
{ {
@@ -210,7 +210,7 @@ public class FlatComponents2Test
}); });
scrollPane1.setViewportView(list1); scrollPane1.setViewportView(list1);
} }
add(scrollPane1, "cell 1 1,growx"); add(scrollPane1, "cell 1 1");
//======== scrollPane2 ======== //======== scrollPane2 ========
{ {
@@ -242,11 +242,11 @@ public class FlatComponents2Test
list2.setEnabled(false); list2.setEnabled(false);
scrollPane2.setViewportView(list2); scrollPane2.setViewportView(list2);
} }
add(scrollPane2, "cell 2 1,growx"); add(scrollPane2, "cell 2 1");
//---- treeLabel ---- //---- treeLabel ----
treeLabel.setText("JTree:"); treeLabel.setText("JTree:");
add(treeLabel, "cell 0 2"); add(treeLabel, "cell 0 2,aligny top,growy 0");
//======== scrollPane3 ======== //======== scrollPane3 ========
{ {
@@ -256,7 +256,7 @@ public class FlatComponents2Test
tree1.setEditable(true); tree1.setEditable(true);
scrollPane3.setViewportView(tree1); scrollPane3.setViewportView(tree1);
} }
add(scrollPane3, "cell 1 2,growx"); add(scrollPane3, "cell 1 2");
//======== scrollPane4 ======== //======== scrollPane4 ========
{ {
@@ -265,11 +265,11 @@ public class FlatComponents2Test
tree2.setEnabled(false); tree2.setEnabled(false);
scrollPane4.setViewportView(tree2); scrollPane4.setViewportView(tree2);
} }
add(scrollPane4, "cell 2 2,growx"); add(scrollPane4, "cell 2 2");
//---- tableLabel ---- //---- tableLabel ----
tableLabel.setText("JTable:"); tableLabel.setText("JTable:");
add(tableLabel, "cell 0 3"); add(tableLabel, "cell 0 3,aligny top,growy 0");
//======== scrollPane5 ======== //======== scrollPane5 ========
{ {
@@ -345,7 +345,7 @@ public class FlatComponents2Test
table1.setAutoCreateRowSorter(true); table1.setAutoCreateRowSorter(true);
scrollPane5.setViewportView(table1); scrollPane5.setViewportView(table1);
} }
add(scrollPane5, "cell 1 3 2 1,growx,width 300"); add(scrollPane5, "cell 1 3 2 1,width 300");
//---- dndCheckBox ---- //---- dndCheckBox ----
dndCheckBox.setText("enable drag and drop"); dndCheckBox.setText("enable drag and drop");

20
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.jfd
View File

@@ -8,8 +8,8 @@ new FormModel {
} }
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "ltr,insets dialog,hidemode 3" "$layoutConstraints": "ltr,insets dialog,hidemode 3"
"$columnConstraints": "[][200][200]" "$columnConstraints": "[][200,fill][200,fill]"
"$rowConstraints": "[][][::200][150,grow][][]" "$rowConstraints": "[][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][][]"
} ) { } ) {
name: "this" name: "this"
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
@@ -35,7 +35,7 @@ new FormModel {
name: "listLabel" name: "listLabel"
"text": "JList:" "text": "JList:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 1" "value": "cell 0 1,aligny top,growy 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane1" name: "scrollPane1"
@@ -64,7 +64,7 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 1,growx" "value": "cell 1 1"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane2" name: "scrollPane2"
@@ -94,13 +94,13 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 1,growx" "value": "cell 2 1"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "treeLabel" name: "treeLabel"
"text": "JTree:" "text": "JTree:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 2" "value": "cell 0 2,aligny top,growy 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane3" name: "scrollPane3"
@@ -113,7 +113,7 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 2,growx" "value": "cell 1 2"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane4" name: "scrollPane4"
@@ -125,13 +125,13 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 2,growx" "value": "cell 2 2"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "tableLabel" name: "tableLabel"
"text": "JTable:" "text": "JTable:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 3" "value": "cell 0 3,aligny top,growy 0"
} ) } )
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
name: "scrollPane5" name: "scrollPane5"
@@ -272,7 +272,7 @@ new FormModel {
} }
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 3 2 1,growx,width 300" "value": "cell 1 3 2 1,width 300"
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "dndCheckBox" name: "dndCheckBox"

12
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java
View File

@@ -133,8 +133,8 @@ public class FlatContainerTest
{ {
panel9.setOpaque(false); panel9.setOpaque(false);
panel9.setLayout(new FormLayout( panel9.setLayout(new FormLayout(
"70dlu:grow, $lcgap, 70dlu:grow", "70dlu:grow, $ugap, 70dlu:grow",
"default, $lgap, fill:70dlu, $lgap, pref, 2*($lgap, fill:70dlu:grow), $lgap, pref")); "default, $lgap, fill:70dlu, $pgap, pref, $lgap, 2*(fill:70dlu:grow, $ugap), pref"));
//---- splitPaneLabel ---- //---- splitPaneLabel ----
splitPaneLabel.setText("JSplitPane:"); splitPaneLabel.setText("JSplitPane:");
@@ -347,24 +347,24 @@ public class FlatContainerTest
"[center]")); "[center]"));
//---- moreTabsCheckBox ---- //---- moreTabsCheckBox ----
moreTabsCheckBox.setText("more tabs"); moreTabsCheckBox.setText("More tabs");
moreTabsCheckBox.setMnemonic('M'); moreTabsCheckBox.setMnemonic('M');
moreTabsCheckBox.addActionListener(e -> moreTabsChanged()); moreTabsCheckBox.addActionListener(e -> moreTabsChanged());
panel14.add(moreTabsCheckBox, "cell 0 0"); panel14.add(moreTabsCheckBox, "cell 0 0");
//---- tabScrollCheckBox ---- //---- tabScrollCheckBox ----
tabScrollCheckBox.setText("tabLayoutPolicy = SCROLL"); tabScrollCheckBox.setText("Use scroll layout");
tabScrollCheckBox.setMnemonic('S'); tabScrollCheckBox.setMnemonic('S');
tabScrollCheckBox.addActionListener(e -> tabScrollChanged()); tabScrollCheckBox.addActionListener(e -> tabScrollChanged());
panel14.add(tabScrollCheckBox, "cell 1 0,alignx left,growx 0"); panel14.add(tabScrollCheckBox, "cell 1 0,alignx left,growx 0");
//---- showTabSeparatorsCheckBox ---- //---- showTabSeparatorsCheckBox ----
showTabSeparatorsCheckBox.setText("JTabbedPane.showTabSeparators"); showTabSeparatorsCheckBox.setText("Show tab separators");
showTabSeparatorsCheckBox.addActionListener(e -> showTabSeparatorsChanged()); showTabSeparatorsCheckBox.addActionListener(e -> showTabSeparatorsChanged());
panel14.add(showTabSeparatorsCheckBox, "cell 2 0"); panel14.add(showTabSeparatorsCheckBox, "cell 2 0");
//---- hasFullBorderCheckBox ---- //---- hasFullBorderCheckBox ----
hasFullBorderCheckBox.setText("JTabbedPane.hasFullBorder"); hasFullBorderCheckBox.setText("Show full border");
hasFullBorderCheckBox.setMnemonic('F'); hasFullBorderCheckBox.setMnemonic('F');
hasFullBorderCheckBox.addActionListener(e -> hasFullBorderChanged()); hasFullBorderCheckBox.addActionListener(e -> hasFullBorderChanged());
panel14.add(hasFullBorderCheckBox, "cell 3 0,alignx left,growx 0"); panel14.add(hasFullBorderCheckBox, "cell 3 0,alignx left,growx 0");

14
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.jfd
View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.1" encoding: "UTF-8" JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
@@ -13,8 +13,8 @@ new FormModel {
} ) { } ) {
name: "this" name: "this"
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) {
"$columnSpecs": "70dlu:grow, labelcompgap, 70dlu:grow" "$columnSpecs": "70dlu:grow, unrelgap, 70dlu:grow"
"$rowSpecs": "default, linegap, fill:70dlu, linegap, pref, linegap, fill:70dlu:grow, linegap, fill:70dlu:grow, linegap, pref" "$rowSpecs": "default, linegap, fill:70dlu, pargap, pref, linegap, fill:70dlu:grow, unrelgap, fill:70dlu:grow, unrelgap, pref"
} ) { } ) {
name: "panel9" name: "panel9"
"opaque": false "opaque": false
@@ -239,7 +239,7 @@ new FormModel {
"opaque": false "opaque": false
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "moreTabsCheckBox" name: "moreTabsCheckBox"
"text": "more tabs" "text": "More tabs"
"mnemonic": 77 "mnemonic": 77
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false
@@ -250,7 +250,7 @@ new FormModel {
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "tabScrollCheckBox" name: "tabScrollCheckBox"
"text": "tabLayoutPolicy = SCROLL" "text": "Use scroll layout"
"mnemonic": 83 "mnemonic": 83
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false
@@ -261,7 +261,7 @@ new FormModel {
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "showTabSeparatorsCheckBox" name: "showTabSeparatorsCheckBox"
"text": "JTabbedPane.showTabSeparators" "text": "Show tab separators"
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false
} }
@@ -271,7 +271,7 @@ new FormModel {
} ) } )
add( new FormComponent( "javax.swing.JCheckBox" ) { add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "hasFullBorderCheckBox" name: "hasFullBorderCheckBox"
"text": "JTabbedPane.hasFullBorder" "text": "Show full border"
"mnemonic": 70 "mnemonic": 70
auxiliary() { auxiliary() {
"JavaCodeGenerator.variableLocal": false "JavaCodeGenerator.variableLocal": false

8
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.java
View File

@@ -17,7 +17,6 @@
package com.formdev.flatlaf.testing.extras; package com.formdev.flatlaf.testing.extras;
import javax.swing.*; import javax.swing.*;
import com.formdev.flatlaf.FlatIconColors;
import com.formdev.flatlaf.extras.*; import com.formdev.flatlaf.extras.*;
import com.formdev.flatlaf.testing.*; import com.formdev.flatlaf.testing.*;
import net.miginfocom.swing.*; import net.miginfocom.swing.*;
@@ -31,7 +30,6 @@ public class FlatExtrasTest
public static void main( String[] args ) { public static void main( String[] args ) {
SwingUtilities.invokeLater( () -> { SwingUtilities.invokeLater( () -> {
FlatTestFrame frame = FlatTestFrame.create( args, "FlatExtrasTest" ); FlatTestFrame frame = FlatTestFrame.create( args, "FlatExtrasTest" );
System.out.println( UIManager.getColor( FlatIconColors.ACTIONS_GREY.key ) );
frame.showFrame( FlatExtrasTest::new ); frame.showFrame( FlatExtrasTest::new );
} ); } );
} }
@@ -109,7 +107,8 @@ public class FlatExtrasTest
//---- triStateLabel1 ---- //---- triStateLabel1 ----
triStateLabel1.setText("text"); triStateLabel1.setText("text");
add(triStateLabel1, "cell 2 0"); triStateLabel1.setEnabled(false);
add(triStateLabel1, "cell 2 0,gapx 30");
//---- triStateCheckBox2 ---- //---- triStateCheckBox2 ----
triStateCheckBox2.setText("third state disabled"); triStateCheckBox2.setText("third state disabled");
@@ -119,7 +118,8 @@ public class FlatExtrasTest
//---- triStateLabel2 ---- //---- triStateLabel2 ----
triStateLabel2.setText("text"); triStateLabel2.setText("text");
add(triStateLabel2, "cell 2 1"); triStateLabel2.setEnabled(false);
add(triStateLabel2, "cell 2 1,gapx 30");
//---- label2 ---- //---- label2 ----
label2.setText("SVG Icons:"); label2.setText("SVG Icons:");

8
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.jfd
View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8" JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
@@ -25,8 +25,9 @@ new FormModel {
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "triStateLabel1" name: "triStateLabel1"
"text": "text" "text": "text"
"enabled": false
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 0" "value": "cell 2 0,gapx 30"
} ) } )
add( new FormComponent( "com.formdev.flatlaf.extras.TriStateCheckBox" ) { add( new FormComponent( "com.formdev.flatlaf.extras.TriStateCheckBox" ) {
name: "triStateCheckBox2" name: "triStateCheckBox2"
@@ -39,8 +40,9 @@ new FormModel {
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "triStateLabel2" name: "triStateLabel2"
"text": "text" "text": "text"
"enabled": false
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 2 1" "value": "cell 2 1,gapx 30"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "label2" name: "label2"