diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java index e6b446d6..d5ab79db 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java @@ -89,20 +89,20 @@ class DataComponentsPanel //======== this ======== setLayout(new MigLayout( - "hidemode 3", + "insets dialog,hidemode 3", // columns "[]" + - "[200]" + - "[200]", + "[200,fill]" + + "[200,fill]", // rows - "[]" + - "[::200]" + - "[::150]" + + "[150,grow,sizegroup 1,fill]" + + "[150,grow,sizegroup 1,fill]" + + "[150,grow,sizegroup 1,fill]" + "[]")); //---- listLabel ---- listLabel.setText("JList:"); - add(listLabel, "cell 0 0"); + add(listLabel, "cell 0 0,aligny top,growy 0"); //======== scrollPane1 ======== { @@ -134,7 +134,7 @@ class DataComponentsPanel list1.setComponentPopupMenu(popupMenu2); scrollPane1.setViewportView(list1); } - add(scrollPane1, "cell 1 0,growx"); + add(scrollPane1, "cell 1 0"); //======== scrollPane2 ======== { @@ -166,11 +166,11 @@ class DataComponentsPanel list2.setEnabled(false); scrollPane2.setViewportView(list2); } - add(scrollPane2, "cell 2 0,growx"); + add(scrollPane2, "cell 2 0"); //---- treeLabel ---- treeLabel.setText("JTree:"); - add(treeLabel, "cell 0 1"); + add(treeLabel, "cell 0 1,aligny top,growy 0"); //======== scrollPane3 ======== { @@ -207,7 +207,7 @@ class DataComponentsPanel tree1.setComponentPopupMenu(popupMenu2); scrollPane3.setViewportView(tree1); } - add(scrollPane3, "cell 1 1,growx"); + add(scrollPane3, "cell 1 1"); //======== scrollPane4 ======== { @@ -216,11 +216,11 @@ class DataComponentsPanel tree2.setEnabled(false); scrollPane4.setViewportView(tree2); } - add(scrollPane4, "cell 2 1,growx"); + add(scrollPane4, "cell 2 1"); //---- tableLabel ---- tableLabel.setText("JTable:"); - add(tableLabel, "cell 0 2"); + add(tableLabel, "cell 0 2,aligny top,growy 0"); //======== scrollPane5 ======== { @@ -297,7 +297,7 @@ class DataComponentsPanel table1.setComponentPopupMenu(popupMenu2); scrollPane5.setViewportView(table1); } - add(scrollPane5, "cell 1 2 2 1,growx,width 300"); + add(scrollPane5, "cell 1 2 2 1,width 300"); //---- dndCheckBox ---- dndCheckBox.setText("enable drag and drop"); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.jfd index e855b65d..7f06c857 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.jfd +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.jfd @@ -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 { contentType: "form/swing" @@ -7,16 +7,16 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "hidemode 3" - "$columnConstraints": "[][200][200]" - "$rowConstraints": "[][::200][::150][]" + "$layoutConstraints": "insets dialog,hidemode 3" + "$columnConstraints": "[][200,fill][200,fill]" + "$rowConstraints": "[150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][]" } ) { name: "this" add( new FormComponent( "javax.swing.JLabel" ) { name: "listLabel" "text": "JList:" }, 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 ) ) { name: "scrollPane1" @@ -46,7 +46,7 @@ new FormModel { } } ) }, 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 ) ) { name: "scrollPane2" @@ -76,13 +76,13 @@ new FormModel { } } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 0,growx" + "value": "cell 2 0" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "treeLabel" "text": "JTree:" }, 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 ) ) { name: "scrollPane3" @@ -150,7 +150,7 @@ new FormModel { } } ) }, 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 ) ) { name: "scrollPane4" @@ -162,13 +162,13 @@ new FormModel { } } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 1,growx" + "value": "cell 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "tableLabel" "text": "JTable:" }, 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 ) ) { name: "scrollPane5" @@ -307,7 +307,7 @@ new FormModel { } } ) }, 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" ) { name: "dndCheckBox" diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java index c3f73371..98de9d00 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java @@ -93,7 +93,7 @@ class OptionPanePanel //======== panel9 ======== { panel9.setLayout(new MigLayout( - "flowy,hidemode 3", + "flowy,insets dialog,hidemode 3", // columns "[]" + "[]" + diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd index 1222377c..23905510 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd @@ -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 { contentType: "form/swing" @@ -12,7 +12,7 @@ new FormModel { name: "scrollPane1" "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 ) { - "$layoutConstraints": "flowy,hidemode 3" + "$layoutConstraints": "flowy,insets dialog,hidemode 3" "$columnConstraints": "[][][fill]" "$rowConstraints": "[top][top][top][top][top][top][top][top]" } ) { diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java index aa78d0c3..8c96683f 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java @@ -111,7 +111,7 @@ class TabsPanel //======== this ======== setLayout(new MigLayout( - "hidemode 3", + "insets dialog,hidemode 3", // columns "[grow,fill]", // rows @@ -120,8 +120,8 @@ class TabsPanel //======== panel9 ======== { panel9.setLayout(new FormLayout( - "70dlu:grow, $lcgap, 70dlu:grow", - "default, $lgap, fill:70dlu, $lgap, pref, 2*($lgap, fill:70dlu:grow), $lgap, pref")); + "70dlu:grow, $ugap, 70dlu:grow", + "default, $lgap, fill:70dlu, $pgap, pref, $lgap, 2*(fill:70dlu:grow, $ugap), pref")); //---- splitPaneLabel ---- splitPaneLabel.setText("JSplitPane:"); @@ -301,24 +301,24 @@ class TabsPanel "[center]")); //---- moreTabsCheckBox ---- - moreTabsCheckBox.setText("more tabs"); + moreTabsCheckBox.setText("More tabs"); moreTabsCheckBox.setMnemonic('M'); moreTabsCheckBox.addActionListener(e -> moreTabsChanged()); panel14.add(moreTabsCheckBox, "cell 0 0"); //---- tabScrollCheckBox ---- - tabScrollCheckBox.setText("tabLayoutPolicy = SCROLL"); + tabScrollCheckBox.setText("Use scroll layout"); tabScrollCheckBox.setMnemonic('S'); tabScrollCheckBox.addActionListener(e -> tabScrollChanged()); panel14.add(tabScrollCheckBox, "cell 1 0,alignx left,growx 0"); //---- showTabSeparatorsCheckBox ---- - showTabSeparatorsCheckBox.setText("JTabbedPane.showTabSeparators"); + showTabSeparatorsCheckBox.setText("Show tab separators"); showTabSeparatorsCheckBox.addActionListener(e -> showTabSeparatorsChanged()); panel14.add(showTabSeparatorsCheckBox, "cell 2 0"); //---- hasFullBorderCheckBox ---- - hasFullBorderCheckBox.setText("JTabbedPane.hasFullBorder"); + hasFullBorderCheckBox.setText("Show full border"); hasFullBorderCheckBox.setMnemonic('F'); hasFullBorderCheckBox.addActionListener(e -> hasFullBorderChanged()); panel14.add(hasFullBorderCheckBox, "cell 3 0,alignx left,growx 0"); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.jfd index 39e68c1f..072cc2eb 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.jfd +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.jfd @@ -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 { contentType: "form/swing" @@ -7,14 +7,14 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "hidemode 3" + "$layoutConstraints": "insets dialog,hidemode 3" "$columnConstraints": "[grow,fill]" "$rowConstraints": "[grow,fill]" } ) { name: "this" add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) { - "$columnSpecs": "70dlu:grow, labelcompgap, 70dlu:grow" - "$rowSpecs": "default, linegap, fill:70dlu, linegap, pref, linegap, fill:70dlu:grow, linegap, fill:70dlu:grow, linegap, pref" + "$columnSpecs": "70dlu:grow, unrelgap, 70dlu:grow" + "$rowSpecs": "default, linegap, fill:70dlu, pargap, pref, linegap, fill:70dlu:grow, unrelgap, fill:70dlu:grow, unrelgap, pref" } ) { name: "panel9" add( new FormComponent( "javax.swing.JLabel" ) { @@ -205,7 +205,7 @@ new FormModel { name: "panel14" add( new FormComponent( "javax.swing.JCheckBox" ) { name: "moreTabsCheckBox" - "text": "more tabs" + "text": "More tabs" "mnemonic": 77 auxiliary() { "JavaCodeGenerator.variableLocal": false @@ -216,7 +216,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "tabScrollCheckBox" - "text": "tabLayoutPolicy = SCROLL" + "text": "Use scroll layout" "mnemonic": 83 auxiliary() { "JavaCodeGenerator.variableLocal": false @@ -227,7 +227,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "showTabSeparatorsCheckBox" - "text": "JTabbedPane.showTabSeparators" + "text": "Show tab separators" auxiliary() { "JavaCodeGenerator.variableLocal": false } @@ -237,7 +237,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "hasFullBorderCheckBox" - "text": "JTabbedPane.hasFullBorder" + "text": "Show full border" "mnemonic": 70 auxiliary() { "JavaCodeGenerator.variableLocal": false diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.java index f8281660..a7291324 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.java @@ -71,7 +71,7 @@ public class ExtrasPanel //======== this ======== setLayout(new MigLayout( - "hidemode 3", + "insets dialog,hidemode 3", // columns "[]" + "[]" + @@ -98,7 +98,7 @@ public class ExtrasPanel //---- triStateLabel1 ---- triStateLabel1.setText("text"); triStateLabel1.setEnabled(false); - add(triStateLabel1, "cell 2 1"); + add(triStateLabel1, "cell 2 1,gapx 30"); //---- label2 ---- label2.setText("SVG Icons:"); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.jfd index 1a649f89..80741d5c 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.jfd +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.jfd @@ -4,7 +4,7 @@ new FormModel { contentType: "form/swing" root: new FormRoot { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "hidemode 3" + "$layoutConstraints": "insets dialog,hidemode 3" "$columnConstraints": "[][][left]" "$rowConstraints": "[]para[][][]" } ) { @@ -33,7 +33,7 @@ new FormModel { "text": "text" "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 1" + "value": "cell 2 1,gapx 30" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label2" diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java index 643bcf55..2a4546ea 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java @@ -154,13 +154,13 @@ public class FlatComponents2Test "ltr,insets dialog,hidemode 3", // columns "[]" + - "[200]" + - "[200]", + "[200,fill]" + + "[200,fill]", // rows "[]" + - "[]" + - "[::200]" + - "[150,grow]" + + "[150,grow,sizegroup 1,fill]" + + "[150,grow,sizegroup 1,fill]" + + "[150,grow,sizegroup 1,fill]" + "[]" + "[]")); @@ -179,7 +179,7 @@ public class FlatComponents2Test //---- listLabel ---- listLabel.setText("JList:"); - add(listLabel, "cell 0 1"); + add(listLabel, "cell 0 1,aligny top,growy 0"); //======== scrollPane1 ======== { @@ -210,7 +210,7 @@ public class FlatComponents2Test }); scrollPane1.setViewportView(list1); } - add(scrollPane1, "cell 1 1,growx"); + add(scrollPane1, "cell 1 1"); //======== scrollPane2 ======== { @@ -242,11 +242,11 @@ public class FlatComponents2Test list2.setEnabled(false); scrollPane2.setViewportView(list2); } - add(scrollPane2, "cell 2 1,growx"); + add(scrollPane2, "cell 2 1"); //---- treeLabel ---- treeLabel.setText("JTree:"); - add(treeLabel, "cell 0 2"); + add(treeLabel, "cell 0 2,aligny top,growy 0"); //======== scrollPane3 ======== { @@ -256,7 +256,7 @@ public class FlatComponents2Test tree1.setEditable(true); scrollPane3.setViewportView(tree1); } - add(scrollPane3, "cell 1 2,growx"); + add(scrollPane3, "cell 1 2"); //======== scrollPane4 ======== { @@ -265,11 +265,11 @@ public class FlatComponents2Test tree2.setEnabled(false); scrollPane4.setViewportView(tree2); } - add(scrollPane4, "cell 2 2,growx"); + add(scrollPane4, "cell 2 2"); //---- tableLabel ---- tableLabel.setText("JTable:"); - add(tableLabel, "cell 0 3"); + add(tableLabel, "cell 0 3,aligny top,growy 0"); //======== scrollPane5 ======== { @@ -345,7 +345,7 @@ public class FlatComponents2Test table1.setAutoCreateRowSorter(true); scrollPane5.setViewportView(table1); } - add(scrollPane5, "cell 1 3 2 1,growx,width 300"); + add(scrollPane5, "cell 1 3 2 1,width 300"); //---- dndCheckBox ---- dndCheckBox.setText("enable drag and drop"); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.jfd index ed3bbc88..fecac421 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.jfd @@ -8,8 +8,8 @@ new FormModel { } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$layoutConstraints": "ltr,insets dialog,hidemode 3" - "$columnConstraints": "[][200][200]" - "$rowConstraints": "[][][::200][150,grow][][]" + "$columnConstraints": "[][200,fill][200,fill]" + "$rowConstraints": "[][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][][]" } ) { name: "this" add( new FormComponent( "javax.swing.JLabel" ) { @@ -35,7 +35,7 @@ new FormModel { name: "listLabel" "text": "JList:" }, 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 ) ) { name: "scrollPane1" @@ -64,7 +64,7 @@ new FormModel { } } ) }, 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 ) ) { name: "scrollPane2" @@ -94,13 +94,13 @@ new FormModel { } } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 1,growx" + "value": "cell 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "treeLabel" "text": "JTree:" }, 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 ) ) { name: "scrollPane3" @@ -113,7 +113,7 @@ new FormModel { } } ) }, 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 ) ) { name: "scrollPane4" @@ -125,13 +125,13 @@ new FormModel { } } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 2,growx" + "value": "cell 2 2" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "tableLabel" "text": "JTable:" }, 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 ) ) { name: "scrollPane5" @@ -272,7 +272,7 @@ new FormModel { } } ) }, 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" ) { name: "dndCheckBox" diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java index daf5779e..264528e0 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java @@ -133,8 +133,8 @@ public class FlatContainerTest { panel9.setOpaque(false); panel9.setLayout(new FormLayout( - "70dlu:grow, $lcgap, 70dlu:grow", - "default, $lgap, fill:70dlu, $lgap, pref, 2*($lgap, fill:70dlu:grow), $lgap, pref")); + "70dlu:grow, $ugap, 70dlu:grow", + "default, $lgap, fill:70dlu, $pgap, pref, $lgap, 2*(fill:70dlu:grow, $ugap), pref")); //---- splitPaneLabel ---- splitPaneLabel.setText("JSplitPane:"); @@ -347,24 +347,24 @@ public class FlatContainerTest "[center]")); //---- moreTabsCheckBox ---- - moreTabsCheckBox.setText("more tabs"); + moreTabsCheckBox.setText("More tabs"); moreTabsCheckBox.setMnemonic('M'); moreTabsCheckBox.addActionListener(e -> moreTabsChanged()); panel14.add(moreTabsCheckBox, "cell 0 0"); //---- tabScrollCheckBox ---- - tabScrollCheckBox.setText("tabLayoutPolicy = SCROLL"); + tabScrollCheckBox.setText("Use scroll layout"); tabScrollCheckBox.setMnemonic('S'); tabScrollCheckBox.addActionListener(e -> tabScrollChanged()); panel14.add(tabScrollCheckBox, "cell 1 0,alignx left,growx 0"); //---- showTabSeparatorsCheckBox ---- - showTabSeparatorsCheckBox.setText("JTabbedPane.showTabSeparators"); + showTabSeparatorsCheckBox.setText("Show tab separators"); showTabSeparatorsCheckBox.addActionListener(e -> showTabSeparatorsChanged()); panel14.add(showTabSeparatorsCheckBox, "cell 2 0"); //---- hasFullBorderCheckBox ---- - hasFullBorderCheckBox.setText("JTabbedPane.hasFullBorder"); + hasFullBorderCheckBox.setText("Show full border"); hasFullBorderCheckBox.setMnemonic('F'); hasFullBorderCheckBox.addActionListener(e -> hasFullBorderChanged()); panel14.add(hasFullBorderCheckBox, "cell 3 0,alignx left,growx 0"); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.jfd index 8fc771a9..d47aceb2 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.jfd @@ -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 { contentType: "form/swing" @@ -13,8 +13,8 @@ new FormModel { } ) { name: "this" add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) { - "$columnSpecs": "70dlu:grow, labelcompgap, 70dlu:grow" - "$rowSpecs": "default, linegap, fill:70dlu, linegap, pref, linegap, fill:70dlu:grow, linegap, fill:70dlu:grow, linegap, pref" + "$columnSpecs": "70dlu:grow, unrelgap, 70dlu:grow" + "$rowSpecs": "default, linegap, fill:70dlu, pargap, pref, linegap, fill:70dlu:grow, unrelgap, fill:70dlu:grow, unrelgap, pref" } ) { name: "panel9" "opaque": false @@ -239,7 +239,7 @@ new FormModel { "opaque": false add( new FormComponent( "javax.swing.JCheckBox" ) { name: "moreTabsCheckBox" - "text": "more tabs" + "text": "More tabs" "mnemonic": 77 auxiliary() { "JavaCodeGenerator.variableLocal": false @@ -250,7 +250,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "tabScrollCheckBox" - "text": "tabLayoutPolicy = SCROLL" + "text": "Use scroll layout" "mnemonic": 83 auxiliary() { "JavaCodeGenerator.variableLocal": false @@ -261,7 +261,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "showTabSeparatorsCheckBox" - "text": "JTabbedPane.showTabSeparators" + "text": "Show tab separators" auxiliary() { "JavaCodeGenerator.variableLocal": false } @@ -271,7 +271,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "hasFullBorderCheckBox" - "text": "JTabbedPane.hasFullBorder" + "text": "Show full border" "mnemonic": 70 auxiliary() { "JavaCodeGenerator.variableLocal": false diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.java index 5fca6d9b..f010302f 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.java @@ -17,7 +17,6 @@ package com.formdev.flatlaf.testing.extras; import javax.swing.*; -import com.formdev.flatlaf.FlatIconColors; import com.formdev.flatlaf.extras.*; import com.formdev.flatlaf.testing.*; import net.miginfocom.swing.*; @@ -31,7 +30,6 @@ public class FlatExtrasTest public static void main( String[] args ) { SwingUtilities.invokeLater( () -> { FlatTestFrame frame = FlatTestFrame.create( args, "FlatExtrasTest" ); - System.out.println( UIManager.getColor( FlatIconColors.ACTIONS_GREY.key ) ); frame.showFrame( FlatExtrasTest::new ); } ); } @@ -109,7 +107,8 @@ public class FlatExtrasTest //---- triStateLabel1 ---- triStateLabel1.setText("text"); - add(triStateLabel1, "cell 2 0"); + triStateLabel1.setEnabled(false); + add(triStateLabel1, "cell 2 0,gapx 30"); //---- triStateCheckBox2 ---- triStateCheckBox2.setText("third state disabled"); @@ -119,7 +118,8 @@ public class FlatExtrasTest //---- triStateLabel2 ---- triStateLabel2.setText("text"); - add(triStateLabel2, "cell 2 1"); + triStateLabel2.setEnabled(false); + add(triStateLabel2, "cell 2 1,gapx 30"); //---- label2 ---- label2.setText("SVG Icons:"); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.jfd index 18a42ed0..85f30970 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/extras/FlatExtrasTest.jfd @@ -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 { contentType: "form/swing" @@ -25,8 +25,9 @@ new FormModel { add( new FormComponent( "javax.swing.JLabel" ) { name: "triStateLabel1" "text": "text" + "enabled": false }, 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" ) { name: "triStateCheckBox2" @@ -39,8 +40,9 @@ new FormModel { add( new FormComponent( "javax.swing.JLabel" ) { name: "triStateLabel2" "text": "text" + "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 1" + "value": "cell 2 1,gapx 30" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label2"