From 6e5e548c9d362b214c1ef07831fad5b6f2eec1e9 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 25 Oct 2019 10:44:24 +0200 Subject: [PATCH] Testing: fixed content panel insets and removed 5,5 gaps --- .../com/formdev/flatlaf/testing/FlatChooserTest.java | 2 +- .../com/formdev/flatlaf/testing/FlatChooserTest.jfd | 2 +- .../formdev/flatlaf/testing/FlatComponents2Test.java | 2 +- .../formdev/flatlaf/testing/FlatComponents2Test.jfd | 2 +- .../formdev/flatlaf/testing/FlatComponentsTest.java | 4 ++-- .../com/formdev/flatlaf/testing/FlatComponentsTest.jfd | 4 ++-- .../com/formdev/flatlaf/testing/FlatContainerTest.java | 2 +- .../com/formdev/flatlaf/testing/FlatContainerTest.jfd | 2 +- .../com/formdev/flatlaf/testing/FlatMenusTest.java | 10 +++++----- .../java/com/formdev/flatlaf/testing/FlatMenusTest.jfd | 10 +++++----- .../formdev/flatlaf/testing/FlatOptionPaneTest.java | 2 +- .../com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd | 4 ++-- .../com/formdev/flatlaf/testing/FlatTestFrame.java | 2 +- .../java/com/formdev/flatlaf/testing/FlatTestFrame.jfd | 2 +- .../formdev/flatlaf/testing/extras/FlatExtrasTest.java | 2 +- .../formdev/flatlaf/testing/extras/FlatExtrasTest.jfd | 2 +- .../formdev/flatlaf/testing/swingx/FlatSwingXTest.java | 2 +- .../formdev/flatlaf/testing/swingx/FlatSwingXTest.jfd | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java index 3d9c3cf2..0d1b7328 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java @@ -56,7 +56,7 @@ public class FlatChooserTest //======== this ======== setLayout(new MigLayout( - "insets 0,hidemode 3,gap 5 5,ltr", + "ltr,insets dialog,hidemode 3", // columns "[]" + "[]", diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.jfd index 30fed7d0..d304aa13 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.jfd @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" + "$layoutConstraints": "ltr,insets dialog,hidemode 3" "$columnConstraints": "[][]" "$rowConstraints": "[top][top][]" } ) { 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 e9e2f0e4..74093cfa 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 @@ -62,7 +62,7 @@ public class FlatComponents2Test //======== this ======== setLayout(new MigLayout( - "insets 0,hidemode 3,gap 5 5,ltr", + "ltr,insets dialog,hidemode 3", // columns "[]" + "[200]" + 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 e65436e6..bd6dd617 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 @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" + "$layoutConstraints": "ltr,insets dialog,hidemode 3" "$columnConstraints": "[][200][200]" "$rowConstraints": "[][][][::200][::150]" } ) { diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java index e9f157c6..1b474e42 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java @@ -178,7 +178,7 @@ public class FlatComponentsTest //======== this ======== setLayout(new MigLayout( - "insets 0,hidemode 3,gap 5 5,ltr", + "ltr,insets dialog,hidemode 3", // columns "[]" + "[]" + @@ -760,7 +760,7 @@ public class FlatComponentsTest { panel3.setOpaque(false); panel3.setLayout(new MigLayout( - "insets 0,hidemode 3,gap 5 5,ltr", + "ltr,insets 0,hidemode 3", // columns "[]", // rows diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd index 2972c465..9b653384 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" + "$layoutConstraints": "ltr,insets dialog,hidemode 3" "$columnConstraints": "[][][][][][]" "$rowConstraints": "[][][][][][][][][][][][][][][][][][][][][][]" } ) { @@ -713,7 +713,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$columnConstraints": "[]" "$rowConstraints": "[][][]" - "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" + "$layoutConstraints": "ltr,insets 0,hidemode 3" } ) { name: "panel3" "opaque": false 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 dd0ecaf2..aa24b6d5 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 @@ -104,7 +104,7 @@ public class FlatContainerTest //======== this ======== setLayout(new MigLayout( - "insets 0,hidemode 3", + "insets dialog,hidemode 3", // columns "[grow,fill]", // rows 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 411443d9..99a992ac 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 @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "insets 0,hidemode 3" + "$layoutConstraints": "insets dialog,hidemode 3" "$columnConstraints": "[grow,fill]" "$rowConstraints": "[grow,fill]" } ) { diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java index b21754ee..908f89cc 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java @@ -103,7 +103,7 @@ public class FlatMenusTest //======== this ======== setLayout(new MigLayout( - "insets 0,hidemode 3,gap 5 5,ltr", + "ltr,insets dialog,hidemode 3", // columns "[125]" + "[]" + @@ -157,7 +157,7 @@ public class FlatMenusTest { panel1.setOpaque(false); panel1.setLayout(new MigLayout( - "insets 0,hidemode 3,gap 5 5,ltr", + "ltr,insets 0,hidemode 3", // columns "[125,left]" + "[fill]", @@ -216,7 +216,7 @@ public class FlatMenusTest { panel2.setOpaque(false); panel2.setLayout(new MigLayout( - "insets 0,gap 5 5", + "insets 0", // columns "[fill]", // rows @@ -257,7 +257,7 @@ public class FlatMenusTest { panel3.setOpaque(false); panel3.setLayout(new MigLayout( - "insets 0,gap 5 5", + "insets 0", // columns "[fill]", // rows @@ -297,7 +297,7 @@ public class FlatMenusTest { panel4.setOpaque(false); panel4.setLayout(new MigLayout( - "insets 0,gap 5 5", + "insets 0", // columns "[fill]", // rows diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.jfd index c40b5a9b..bc2ff51b 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.jfd @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" + "$layoutConstraints": "ltr,insets dialog,hidemode 3" "$columnConstraints": "[125][][][][]" "$rowConstraints": "[][top][][]" } ) { @@ -50,7 +50,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$columnConstraints": "[125,left][fill]" "$rowConstraints": "[][][][][]" - "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" + "$layoutConstraints": "ltr,insets 0,hidemode 3" } ) { name: "panel1" "opaque": false @@ -122,7 +122,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$columnConstraints": "[fill]" "$rowConstraints": "[][][][][]" - "$layoutConstraints": "insets 0,gap 5 5" + "$layoutConstraints": "insets 0" } ) { name: "panel2" "opaque": false @@ -163,7 +163,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$columnConstraints": "[fill]" "$rowConstraints": "[][][][]" - "$layoutConstraints": "insets 0,gap 5 5" + "$layoutConstraints": "insets 0" } ) { name: "panel3" "opaque": false @@ -204,7 +204,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$columnConstraints": "[fill]" "$rowConstraints": "[][][][]" - "$layoutConstraints": "insets 0,gap 5 5" + "$layoutConstraints": "insets 0" } ) { name: "panel4" "opaque": false diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java index 1b3edab1..ee2e1960 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java @@ -90,7 +90,7 @@ public class FlatOptionPaneTest //======== this ======== setLayout(new MigLayout( - "flowy,ltr,insets 0,hidemode 3,gap 5 5", + "flowy,ltr,insets dialog,hidemode 3", // columns "[]" + "[]" + diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd index 8c9911bf..529f099f 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "flowy,ltr,insets 0,hidemode 3,gap 5 5" + "$layoutConstraints": "flowy,ltr,insets dialog,hidemode 3" "$columnConstraints": "[][][fill]" "$rowConstraints": "[top][top][top][top][top][top][top][top]" } ) { @@ -239,7 +239,7 @@ new FormModel { } ) }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 ) - "size": new java.awt.Dimension( 790, 840 ) + "size": new java.awt.Dimension( 790, 920 ) } ) } } diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java index 17699d7c..8910ebee 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java @@ -465,7 +465,7 @@ public class FlatTestFrame { Container contentPanelContentPane = contentPanel.getContentPane(); contentPanelContentPane.setLayout(new MigLayout( - "insets dialog,hidemode 3", + "insets 0,hidemode 3", // columns "[grow,fill]", // rows diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd index 9de6ae42..74298f06 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd @@ -11,7 +11,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) { name: "dialogPane" add( new FormContainer( "javax.swing.JRootPane", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "insets dialog,hidemode 3" + "$layoutConstraints": "insets 0,hidemode 3" "$columnConstraints": "[grow,fill]" "$rowConstraints": "[grow,fill]" } ) { 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 51145850..b75b7ba6 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 @@ -59,7 +59,7 @@ public class FlatExtrasTest //======== this ======== setLayout(new MigLayout( - "hidemode 3,ltr", + "ltr,insets dialog,hidemode 3", // columns "[]" + "[]" + 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 8e3591a2..231e5b93 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 @@ -4,7 +4,7 @@ new FormModel { contentType: "form/swing" root: new FormRoot { add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "hidemode 3,ltr" + "$layoutConstraints": "ltr,insets dialog,hidemode 3" "$columnConstraints": "[][][left]" "$rowConstraints": "[][]" } ) { diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java index 67c5db43..365b41aa 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java @@ -103,7 +103,7 @@ public class FlatSwingXTest //======== this ======== setLayout(new MigLayout( - "hidemode 3,ltr", + "ltr,insets dialog,hidemode 3", // columns "[left]" + "[]" + diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.jfd index 9ce95649..4dcca1c4 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.jfd @@ -7,7 +7,7 @@ new FormModel { "JavaCodeGenerator.defaultVariableLocal": true } add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { - "$layoutConstraints": "hidemode 3,ltr" + "$layoutConstraints": "ltr,insets dialog,hidemode 3" "$columnConstraints": "[left][][][fill]" "$rowConstraints": "[]0[][]0[][][][][]" } ) {