From 63da576d850e9a25db4604b21c0abfe64c7e66f9 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 30 Jan 2021 20:53:07 +0100 Subject: [PATCH] FlatComponentStateTest: added selected checkboxes and radiobuttons --- .../testing/FlatComponentStateTest.java | 287 ++++++++++++++---- .../testing/FlatComponentStateTest.jfd | 279 +++++++++++++---- 2 files changed, 444 insertions(+), 122 deletions(-) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.java index d6e2889d..eeb6b45f 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.java @@ -42,11 +42,10 @@ public class FlatComponentStateTest private void initComponents() { // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents label11 = new JLabel(); - label9 = new JLabel(); label12 = new JLabel(); label5 = new JLabel(); - label6 = new JLabel(); label7 = new JLabel(); + label6 = new JLabel(); label8 = new JLabel(); label13 = new JLabel(); label14 = new JLabel(); @@ -54,8 +53,8 @@ public class FlatComponentStateTest label16 = new JLabel(); label1 = new JLabel(); testStateButton1 = new FlatComponentStateTest.TestStateButton(); - testStateButton4 = new FlatComponentStateTest.TestStateButton(); testStateButton7 = new FlatComponentStateTest.TestStateButton(); + testStateButton4 = new FlatComponentStateTest.TestStateButton(); testStateButton10 = new FlatComponentStateTest.TestStateButton(); testStateToggleButton1 = new FlatComponentStateTest.TestStateToggleButton(); testStateToggleButton5 = new FlatComponentStateTest.TestStateToggleButton(); @@ -63,8 +62,8 @@ public class FlatComponentStateTest testStateToggleButton12 = new FlatComponentStateTest.TestStateToggleButton(); label2 = new JLabel(); testStateButton2 = new FlatComponentStateTest.TestStateButton(); - testStateButton5 = new FlatComponentStateTest.TestStateButton(); testStateButton8 = new FlatComponentStateTest.TestStateButton(); + testStateButton5 = new FlatComponentStateTest.TestStateButton(); testStateButton11 = new FlatComponentStateTest.TestStateButton(); testStateToggleButton2 = new FlatComponentStateTest.TestStateToggleButton(); testStateToggleButton6 = new FlatComponentStateTest.TestStateToggleButton(); @@ -72,8 +71,8 @@ public class FlatComponentStateTest testStateToggleButton13 = new FlatComponentStateTest.TestStateToggleButton(); label3 = new JLabel(); testStateButton3 = new FlatComponentStateTest.TestStateButton(); - testStateButton6 = new FlatComponentStateTest.TestStateButton(); testStateButton9 = new FlatComponentStateTest.TestStateButton(); + testStateButton6 = new FlatComponentStateTest.TestStateButton(); testStateButton12 = new FlatComponentStateTest.TestStateButton(); testStateToggleButton3 = new FlatComponentStateTest.TestStateToggleButton(); testStateToggleButton7 = new FlatComponentStateTest.TestStateToggleButton(); @@ -93,30 +92,50 @@ public class FlatComponentStateTest label22 = new JLabel(); label27 = new JLabel(); label23 = new JLabel(); + label28 = new JLabel(); label24 = new JLabel(); + label29 = new JLabel(); label25 = new JLabel(); + label30 = new JLabel(); label26 = new JLabel(); + label31 = new JLabel(); label17 = new JLabel(); testStateCheckBox1 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox8 = new FlatComponentStateTest.TestStateCheckBox(); testStateCheckBox5 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox12 = new FlatComponentStateTest.TestStateCheckBox(); testStateRadioButton1 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton8 = new FlatComponentStateTest.TestStateRadioButton(); testStateRadioButton5 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton9 = new FlatComponentStateTest.TestStateRadioButton(); label18 = new JLabel(); testStateCheckBox2 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox9 = new FlatComponentStateTest.TestStateCheckBox(); testStateCheckBox6 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox13 = new FlatComponentStateTest.TestStateCheckBox(); testStateRadioButton2 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton10 = new FlatComponentStateTest.TestStateRadioButton(); testStateRadioButton6 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton11 = new FlatComponentStateTest.TestStateRadioButton(); label19 = new JLabel(); testStateCheckBox3 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox10 = new FlatComponentStateTest.TestStateCheckBox(); testStateCheckBox7 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox14 = new FlatComponentStateTest.TestStateCheckBox(); testStateRadioButton3 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton12 = new FlatComponentStateTest.TestStateRadioButton(); testStateRadioButton7 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton13 = new FlatComponentStateTest.TestStateRadioButton(); label20 = new JLabel(); testStateCheckBox4 = new FlatComponentStateTest.TestStateCheckBox(); + testStateCheckBox11 = new FlatComponentStateTest.TestStateCheckBox(); testStateRadioButton4 = new FlatComponentStateTest.TestStateRadioButton(); + testStateRadioButton14 = new FlatComponentStateTest.TestStateRadioButton(); label21 = new JLabel(); checkBox1 = new JCheckBox(); + checkBox2 = new JCheckBox(); radioButton1 = new JRadioButton(); + radioButton2 = new JRadioButton(); //======== this ======== setLayout(new MigLayout( @@ -128,7 +147,7 @@ public class FlatComponentStateTest "[fill]" + "[fill]para" + "[fill]" + - "[fill]" + + "[fill]para" + "[fill]" + "[fill]", // rows @@ -153,34 +172,29 @@ public class FlatComponentStateTest label11.setFont(label11.getFont().deriveFont(label11.getFont().getSize() + 4f)); add(label11, "cell 1 0 2 1"); - //---- label9 ---- - label9.setText("default JButton"); - label9.setFont(label9.getFont().deriveFont(label9.getFont().getSize() + 4f)); - add(label9, "cell 3 0 2 1"); - //---- label12 ---- label12.setText("JToggleButton"); label12.setFont(label12.getFont().deriveFont(label12.getFont().getSize() + 4f)); add(label12, "cell 5 0 3 1"); //---- label5 ---- - label5.setText("none"); + label5.setText("regular"); add(label5, "cell 1 1"); + //---- label7 ---- + label7.setText("default"); + add(label7, "cell 2 1"); + //---- label6 ---- label6.setText("focused"); - add(label6, "cell 2 1"); - - //---- label7 ---- - label7.setText("none"); - add(label7, "cell 3 1"); + add(label6, "cell 3 1"); //---- label8 ---- - label8.setText("focused"); + label8.setText("default"); add(label8, "cell 4 1"); //---- label13 ---- - label13.setText("none"); + label13.setText("unsel."); add(label13, "cell 5 1"); //---- label14 ---- @@ -201,22 +215,26 @@ public class FlatComponentStateTest //---- testStateButton1 ---- testStateButton1.setText("text"); + testStateButton1.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton1, "cell 1 2"); - //---- testStateButton4 ---- - testStateButton4.setText("text"); - testStateButton4.setStateFocused(true); - add(testStateButton4, "cell 2 2"); - //---- testStateButton7 ---- testStateButton7.setText("text"); testStateButton7.setStateDefault(true); - add(testStateButton7, "cell 3 2"); + testStateButton7.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton7, "cell 2 2"); + + //---- testStateButton4 ---- + testStateButton4.setText("text"); + testStateButton4.setStateFocused(true); + testStateButton4.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton4, "cell 3 2"); //---- testStateButton10 ---- testStateButton10.setText("text"); testStateButton10.setStateFocused(true); testStateButton10.setStateDefault(true); + testStateButton10.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton10, "cell 4 2"); //---- testStateToggleButton1 ---- @@ -246,25 +264,29 @@ public class FlatComponentStateTest //---- testStateButton2 ---- testStateButton2.setText("text"); testStateButton2.setStateHover(true); + testStateButton2.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton2, "cell 1 3"); - //---- testStateButton5 ---- - testStateButton5.setText("text"); - testStateButton5.setStateHover(true); - testStateButton5.setStateFocused(true); - add(testStateButton5, "cell 2 3"); - //---- testStateButton8 ---- testStateButton8.setText("text"); testStateButton8.setStateHover(true); testStateButton8.setStateDefault(true); - add(testStateButton8, "cell 3 3"); + testStateButton8.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton8, "cell 2 3"); + + //---- testStateButton5 ---- + testStateButton5.setText("text"); + testStateButton5.setStateHover(true); + testStateButton5.setStateFocused(true); + testStateButton5.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton5, "cell 3 3"); //---- testStateButton11 ---- testStateButton11.setText("text"); testStateButton11.setStateHover(true); testStateButton11.setStateFocused(true); testStateButton11.setStateDefault(true); + testStateButton11.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton11, "cell 4 3"); //---- testStateToggleButton2 ---- @@ -298,25 +320,29 @@ public class FlatComponentStateTest //---- testStateButton3 ---- testStateButton3.setText("text"); testStateButton3.setStatePressed(true); + testStateButton3.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton3, "cell 1 4"); - //---- testStateButton6 ---- - testStateButton6.setText("text"); - testStateButton6.setStatePressed(true); - testStateButton6.setStateFocused(true); - add(testStateButton6, "cell 2 4"); - //---- testStateButton9 ---- testStateButton9.setText("text"); testStateButton9.setStatePressed(true); testStateButton9.setStateDefault(true); - add(testStateButton9, "cell 3 4"); + testStateButton9.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton9, "cell 2 4"); + + //---- testStateButton6 ---- + testStateButton6.setText("text"); + testStateButton6.setStatePressed(true); + testStateButton6.setStateFocused(true); + testStateButton6.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton6, "cell 3 4"); //---- testStateButton12 ---- testStateButton12.setText("text"); testStateButton12.setStatePressed(true); testStateButton12.setStateFocused(true); testStateButton12.setStateDefault(true); + testStateButton12.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton12, "cell 4 4"); //---- testStateToggleButton3 ---- @@ -350,13 +376,15 @@ public class FlatComponentStateTest //---- testStateButton13 ---- testStateButton13.setText("text"); testStateButton13.setEnabled(false); + testStateButton13.putClientProperty("JComponent.minimumWidth", 0); add(testStateButton13, "cell 1 5"); //---- testStateButton14 ---- testStateButton14.setText("text"); testStateButton14.setEnabled(false); testStateButton14.setStateDefault(true); - add(testStateButton14, "cell 3 5"); + testStateButton14.putClientProperty("JComponent.minimumWidth", 0); + add(testStateButton14, "cell 2 5"); //---- testStateToggleButton4 ---- testStateToggleButton4.setText("text"); @@ -375,11 +403,13 @@ public class FlatComponentStateTest //---- button1 ---- button1.setText("text"); + button1.putClientProperty("JComponent.minimumWidth", 0); add(button1, "cell 1 6"); //---- testDefaultButton1 ---- testDefaultButton1.setText("text"); - add(testDefaultButton1, "cell 3 6"); + testDefaultButton1.putClientProperty("JComponent.minimumWidth", 0); + add(testDefaultButton1, "cell 2 6"); //---- toggleButton1 ---- toggleButton1.setText("text"); @@ -399,23 +429,39 @@ public class FlatComponentStateTest //---- label27 ---- label27.setText("JRadioButton"); label27.setFont(label27.getFont().deriveFont(label27.getFont().getSize() + 4f)); - add(label27, "cell 3 8 2 1"); + add(label27, "cell 5 8 2 1"); //---- label23 ---- - label23.setText("none"); + label23.setText("unsel."); add(label23, "cell 1 9"); + //---- label28 ---- + label28.setText("selected"); + add(label28, "cell 2 9"); + //---- label24 ---- label24.setText("focused"); - add(label24, "cell 2 9"); + add(label24, "cell 3 9"); + + //---- label29 ---- + label29.setText("selected"); + add(label29, "cell 4 9"); //---- label25 ---- - label25.setText("none"); - add(label25, "cell 3 9"); + label25.setText("unsel."); + add(label25, "cell 5 9"); + + //---- label30 ---- + label30.setText("selected"); + add(label30, "cell 6 9"); //---- label26 ---- label26.setText("focused"); - add(label26, "cell 4 9"); + add(label26, "cell 7 9"); + + //---- label31 ---- + label31.setText("selected"); + add(label31, "cell 8 9"); //---- label17 ---- label17.setText("none"); @@ -425,19 +471,41 @@ public class FlatComponentStateTest testStateCheckBox1.setText("text"); add(testStateCheckBox1, "cell 1 10"); + //---- testStateCheckBox8 ---- + testStateCheckBox8.setText("text"); + testStateCheckBox8.setStateSelected(true); + add(testStateCheckBox8, "cell 2 10"); + //---- testStateCheckBox5 ---- testStateCheckBox5.setText("text"); testStateCheckBox5.setStateFocused(true); - add(testStateCheckBox5, "cell 2 10"); + add(testStateCheckBox5, "cell 3 10"); + + //---- testStateCheckBox12 ---- + testStateCheckBox12.setText("text"); + testStateCheckBox12.setStateFocused(true); + testStateCheckBox12.setStateSelected(true); + add(testStateCheckBox12, "cell 4 10"); //---- testStateRadioButton1 ---- testStateRadioButton1.setText("text"); - add(testStateRadioButton1, "cell 3 10"); + add(testStateRadioButton1, "cell 5 10"); + + //---- testStateRadioButton8 ---- + testStateRadioButton8.setText("text"); + testStateRadioButton8.setStateSelected(true); + add(testStateRadioButton8, "cell 6 10"); //---- testStateRadioButton5 ---- testStateRadioButton5.setText("text"); testStateRadioButton5.setStateFocused(true); - add(testStateRadioButton5, "cell 4 10"); + add(testStateRadioButton5, "cell 7 10"); + + //---- testStateRadioButton9 ---- + testStateRadioButton9.setText("text"); + testStateRadioButton9.setStateFocused(true); + testStateRadioButton9.setStateSelected(true); + add(testStateRadioButton9, "cell 8 10"); //---- label18 ---- label18.setText("hover"); @@ -448,22 +516,48 @@ public class FlatComponentStateTest testStateCheckBox2.setStateHover(true); add(testStateCheckBox2, "cell 1 11"); + //---- testStateCheckBox9 ---- + testStateCheckBox9.setText("text"); + testStateCheckBox9.setStateHover(true); + testStateCheckBox9.setStateSelected(true); + add(testStateCheckBox9, "cell 2 11"); + //---- testStateCheckBox6 ---- testStateCheckBox6.setText("text"); testStateCheckBox6.setStateFocused(true); testStateCheckBox6.setStateHover(true); - add(testStateCheckBox6, "cell 2 11"); + add(testStateCheckBox6, "cell 3 11"); + + //---- testStateCheckBox13 ---- + testStateCheckBox13.setText("text"); + testStateCheckBox13.setStateFocused(true); + testStateCheckBox13.setStateHover(true); + testStateCheckBox13.setStateSelected(true); + add(testStateCheckBox13, "cell 4 11"); //---- testStateRadioButton2 ---- testStateRadioButton2.setText("text"); testStateRadioButton2.setStateHover(true); - add(testStateRadioButton2, "cell 3 11"); + add(testStateRadioButton2, "cell 5 11"); + + //---- testStateRadioButton10 ---- + testStateRadioButton10.setText("text"); + testStateRadioButton10.setStateHover(true); + testStateRadioButton10.setStateSelected(true); + add(testStateRadioButton10, "cell 6 11"); //---- testStateRadioButton6 ---- testStateRadioButton6.setText("text"); testStateRadioButton6.setStateFocused(true); testStateRadioButton6.setStateHover(true); - add(testStateRadioButton6, "cell 4 11"); + add(testStateRadioButton6, "cell 7 11"); + + //---- testStateRadioButton11 ---- + testStateRadioButton11.setText("text"); + testStateRadioButton11.setStateFocused(true); + testStateRadioButton11.setStateHover(true); + testStateRadioButton11.setStateSelected(true); + add(testStateRadioButton11, "cell 8 11"); //---- label19 ---- label19.setText("pressed"); @@ -474,22 +568,48 @@ public class FlatComponentStateTest testStateCheckBox3.setStatePressed(true); add(testStateCheckBox3, "cell 1 12"); + //---- testStateCheckBox10 ---- + testStateCheckBox10.setText("text"); + testStateCheckBox10.setStatePressed(true); + testStateCheckBox10.setStateSelected(true); + add(testStateCheckBox10, "cell 2 12"); + //---- testStateCheckBox7 ---- testStateCheckBox7.setText("text"); testStateCheckBox7.setStateFocused(true); testStateCheckBox7.setStatePressed(true); - add(testStateCheckBox7, "cell 2 12"); + add(testStateCheckBox7, "cell 3 12"); + + //---- testStateCheckBox14 ---- + testStateCheckBox14.setText("text"); + testStateCheckBox14.setStateFocused(true); + testStateCheckBox14.setStatePressed(true); + testStateCheckBox14.setStateSelected(true); + add(testStateCheckBox14, "cell 4 12"); //---- testStateRadioButton3 ---- testStateRadioButton3.setText("text"); testStateRadioButton3.setStatePressed(true); - add(testStateRadioButton3, "cell 3 12"); + add(testStateRadioButton3, "cell 5 12"); + + //---- testStateRadioButton12 ---- + testStateRadioButton12.setText("text"); + testStateRadioButton12.setStatePressed(true); + testStateRadioButton12.setStateSelected(true); + add(testStateRadioButton12, "cell 6 12"); //---- testStateRadioButton7 ---- testStateRadioButton7.setText("text"); testStateRadioButton7.setStateFocused(true); testStateRadioButton7.setStatePressed(true); - add(testStateRadioButton7, "cell 4 12"); + add(testStateRadioButton7, "cell 7 12"); + + //---- testStateRadioButton13 ---- + testStateRadioButton13.setText("text"); + testStateRadioButton13.setStateFocused(true); + testStateRadioButton13.setStatePressed(true); + testStateRadioButton13.setStateSelected(true); + add(testStateRadioButton13, "cell 8 12"); //---- label20 ---- label20.setText("disabled"); @@ -500,10 +620,22 @@ public class FlatComponentStateTest testStateCheckBox4.setEnabled(false); add(testStateCheckBox4, "cell 1 13"); + //---- testStateCheckBox11 ---- + testStateCheckBox11.setText("text"); + testStateCheckBox11.setEnabled(false); + testStateCheckBox11.setStateSelected(true); + add(testStateCheckBox11, "cell 2 13"); + //---- testStateRadioButton4 ---- testStateRadioButton4.setText("text"); testStateRadioButton4.setEnabled(false); - add(testStateRadioButton4, "cell 3 13"); + add(testStateRadioButton4, "cell 5 13"); + + //---- testStateRadioButton14 ---- + testStateRadioButton14.setText("text"); + testStateRadioButton14.setEnabled(false); + testStateRadioButton14.setStateSelected(true); + add(testStateRadioButton14, "cell 6 13"); //---- label21 ---- label21.setText("raw"); @@ -513,19 +645,28 @@ public class FlatComponentStateTest checkBox1.setText("text"); add(checkBox1, "cell 1 14"); + //---- checkBox2 ---- + checkBox2.setText("text"); + checkBox2.setSelected(true); + add(checkBox2, "cell 2 14"); + //---- radioButton1 ---- radioButton1.setText("text"); - add(radioButton1, "cell 3 14"); + add(radioButton1, "cell 5 14"); + + //---- radioButton2 ---- + radioButton2.setText("text"); + radioButton2.setSelected(true); + add(radioButton2, "cell 6 14"); // JFormDesigner - End of component initialization //GEN-END:initComponents } // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables private JLabel label11; - private JLabel label9; private JLabel label12; private JLabel label5; - private JLabel label6; private JLabel label7; + private JLabel label6; private JLabel label8; private JLabel label13; private JLabel label14; @@ -533,8 +674,8 @@ public class FlatComponentStateTest private JLabel label16; private JLabel label1; private FlatComponentStateTest.TestStateButton testStateButton1; - private FlatComponentStateTest.TestStateButton testStateButton4; private FlatComponentStateTest.TestStateButton testStateButton7; + private FlatComponentStateTest.TestStateButton testStateButton4; private FlatComponentStateTest.TestStateButton testStateButton10; private FlatComponentStateTest.TestStateToggleButton testStateToggleButton1; private FlatComponentStateTest.TestStateToggleButton testStateToggleButton5; @@ -542,8 +683,8 @@ public class FlatComponentStateTest private FlatComponentStateTest.TestStateToggleButton testStateToggleButton12; private JLabel label2; private FlatComponentStateTest.TestStateButton testStateButton2; - private FlatComponentStateTest.TestStateButton testStateButton5; private FlatComponentStateTest.TestStateButton testStateButton8; + private FlatComponentStateTest.TestStateButton testStateButton5; private FlatComponentStateTest.TestStateButton testStateButton11; private FlatComponentStateTest.TestStateToggleButton testStateToggleButton2; private FlatComponentStateTest.TestStateToggleButton testStateToggleButton6; @@ -551,8 +692,8 @@ public class FlatComponentStateTest private FlatComponentStateTest.TestStateToggleButton testStateToggleButton13; private JLabel label3; private FlatComponentStateTest.TestStateButton testStateButton3; - private FlatComponentStateTest.TestStateButton testStateButton6; private FlatComponentStateTest.TestStateButton testStateButton9; + private FlatComponentStateTest.TestStateButton testStateButton6; private FlatComponentStateTest.TestStateButton testStateButton12; private FlatComponentStateTest.TestStateToggleButton testStateToggleButton3; private FlatComponentStateTest.TestStateToggleButton testStateToggleButton7; @@ -572,30 +713,50 @@ public class FlatComponentStateTest private JLabel label22; private JLabel label27; private JLabel label23; + private JLabel label28; private JLabel label24; + private JLabel label29; private JLabel label25; + private JLabel label30; private JLabel label26; + private JLabel label31; private JLabel label17; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox1; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox8; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox5; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox12; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton1; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton8; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton5; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton9; private JLabel label18; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox2; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox9; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox6; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox13; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton2; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton10; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton6; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton11; private JLabel label19; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox3; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox10; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox7; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox14; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton3; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton12; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton7; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton13; private JLabel label20; private FlatComponentStateTest.TestStateCheckBox testStateCheckBox4; + private FlatComponentStateTest.TestStateCheckBox testStateCheckBox11; private FlatComponentStateTest.TestStateRadioButton testStateRadioButton4; + private FlatComponentStateTest.TestStateRadioButton testStateRadioButton14; private JLabel label21; private JCheckBox checkBox1; + private JCheckBox checkBox2; private JRadioButton radioButton1; + private JRadioButton radioButton2; // JFormDesigner - End of variables declaration //GEN-END:variables //---- class TestStateButton ---------------------------------------------- diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.jfd index a02d6e34..86ec6637 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentStateTest.jfd @@ -5,7 +5,7 @@ new FormModel { root: new FormRoot { add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$layoutConstraints": "hidemode 3" - "$columnConstraints": "[fill][fill][fill]para[fill][fill]para[fill][fill][fill][fill]" + "$columnConstraints": "[fill][fill][fill]para[fill][fill]para[fill][fill]para[fill][fill]" "$rowConstraints": "[][][][][][]para[][][][][][][][]para[]" } ) { name: "this" @@ -16,13 +16,6 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 0 2 1" } ) - add( new FormComponent( "javax.swing.JLabel" ) { - name: "label9" - "text": "default JButton" - "font": #SwingDerivedFont0 - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 0 2 1" - } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label12" "text": "JToggleButton" @@ -32,31 +25,31 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label5" - "text": "none" + "text": "regular" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 1" } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label7" + "text": "default" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 1" + } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label6" "text": "focused" - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 1" - } ) - add( new FormComponent( "javax.swing.JLabel" ) { - name: "label7" - "text": "none" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 3 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label8" - "text": "focused" + "text": "default" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 4 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label13" - "text": "none" + "text": "unsel." }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 5 1" } ) @@ -87,20 +80,23 @@ new FormModel { add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { name: "testStateButton1" "text": "text" + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 2" } ) - add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { - name: "testStateButton4" - "text": "text" - "stateFocused": true - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 2" - } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { name: "testStateButton7" "text": "text" "stateDefault": true + "$client.JComponent.minimumWidth": 0 + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 2" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { + name: "testStateButton4" + "text": "text" + "stateFocused": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 3 2" } ) @@ -109,6 +105,7 @@ new FormModel { "text": "text" "stateFocused": true "stateDefault": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 4 2" } ) @@ -150,22 +147,25 @@ new FormModel { name: "testStateButton2" "text": "text" "stateHover": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 3" } ) - add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { - name: "testStateButton5" - "text": "text" - "stateHover": true - "stateFocused": true - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 3" - } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { name: "testStateButton8" "text": "text" "stateHover": true "stateDefault": true + "$client.JComponent.minimumWidth": 0 + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 3" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { + name: "testStateButton5" + "text": "text" + "stateHover": true + "stateFocused": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 3 3" } ) @@ -175,6 +175,7 @@ new FormModel { "stateHover": true "stateFocused": true "stateDefault": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 4 3" } ) @@ -220,22 +221,25 @@ new FormModel { name: "testStateButton3" "text": "text" "statePressed": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 4" } ) - add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { - name: "testStateButton6" - "text": "text" - "statePressed": true - "stateFocused": true - }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 4" - } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { name: "testStateButton9" "text": "text" "statePressed": true "stateDefault": true + "$client.JComponent.minimumWidth": 0 + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 4" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateButton" ) { + name: "testStateButton6" + "text": "text" + "statePressed": true + "stateFocused": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 3 4" } ) @@ -245,6 +249,7 @@ new FormModel { "statePressed": true "stateFocused": true "stateDefault": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 4 4" } ) @@ -290,6 +295,7 @@ new FormModel { name: "testStateButton13" "text": "text" "enabled": false + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 5" } ) @@ -298,8 +304,9 @@ new FormModel { "text": "text" "enabled": false "stateDefault": true + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 5" + "value": "cell 2 5" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateToggleButton" ) { name: "testStateToggleButton4" @@ -325,14 +332,16 @@ new FormModel { add( new FormComponent( "javax.swing.JButton" ) { name: "button1" "text": "text" + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 6" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestDefaultButton" ) { name: "testDefaultButton1" "text": "text" + "$client.JComponent.minimumWidth": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 6" + "value": "cell 2 6" } ) add( new FormComponent( "javax.swing.JToggleButton" ) { name: "toggleButton1" @@ -364,31 +373,55 @@ new FormModel { "text": "JRadioButton" "font": #SwingDerivedFont0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 8 2 1" + "value": "cell 5 8 2 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label23" - "text": "none" + "text": "unsel." }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 9" } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label28" + "text": "selected" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 9" + } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label24" "text": "focused" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 9" + "value": "cell 3 9" + } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label29" + "text": "selected" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 4 9" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label25" - "text": "none" + "text": "unsel." }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 9" + "value": "cell 5 9" + } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label30" + "text": "selected" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 6 9" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label26" "text": "focused" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 9" + "value": "cell 7 9" + } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label31" + "text": "selected" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 8 9" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label17" @@ -402,25 +435,55 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 10" } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox8" + "text": "text" + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 10" + } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { name: "testStateCheckBox5" "text": "text" "stateFocused": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 10" + "value": "cell 3 10" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox12" + "text": "text" + "stateFocused": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 4 10" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton1" "text": "text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 10" + "value": "cell 5 10" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton8" + "text": "text" + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 6 10" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton5" "text": "text" "stateFocused": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 10" + "value": "cell 7 10" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton9" + "text": "text" + "stateFocused": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 8 10" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label18" @@ -435,20 +498,45 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 11" } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox9" + "text": "text" + "stateHover": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 11" + } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { name: "testStateCheckBox6" "text": "text" "stateFocused": true "stateHover": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 11" + "value": "cell 3 11" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox13" + "text": "text" + "stateFocused": true + "stateHover": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 4 11" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton2" "text": "text" "stateHover": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 11" + "value": "cell 5 11" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton10" + "text": "text" + "stateHover": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 6 11" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton6" @@ -456,7 +544,16 @@ new FormModel { "stateFocused": true "stateHover": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 11" + "value": "cell 7 11" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton11" + "text": "text" + "stateFocused": true + "stateHover": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 8 11" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label19" @@ -471,20 +568,45 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 12" } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox10" + "text": "text" + "statePressed": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 12" + } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { name: "testStateCheckBox7" "text": "text" "stateFocused": true "statePressed": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 12" + "value": "cell 3 12" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox14" + "text": "text" + "stateFocused": true + "statePressed": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 4 12" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton3" "text": "text" "statePressed": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 12" + "value": "cell 5 12" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton12" + "text": "text" + "statePressed": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 6 12" } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton7" @@ -492,7 +614,16 @@ new FormModel { "stateFocused": true "statePressed": true }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 12" + "value": "cell 7 12" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton13" + "text": "text" + "stateFocused": true + "statePressed": true + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 8 12" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label20" @@ -507,12 +638,28 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 13" } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateCheckBox" ) { + name: "testStateCheckBox11" + "text": "text" + "enabled": false + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 13" + } ) add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { name: "testStateRadioButton4" "text": "text" "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 13" + "value": "cell 5 13" + } ) + add( new FormComponent( "com.formdev.flatlaf.testing.FlatComponentStateTest$TestStateRadioButton" ) { + name: "testStateRadioButton14" + "text": "text" + "enabled": false + "stateSelected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 6 13" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label21" @@ -526,11 +673,25 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 14" } ) + add( new FormComponent( "javax.swing.JCheckBox" ) { + name: "checkBox2" + "text": "text" + "selected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 14" + } ) add( new FormComponent( "javax.swing.JRadioButton" ) { name: "radioButton1" "text": "text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 14" + "value": "cell 5 14" + } ) + add( new FormComponent( "javax.swing.JRadioButton" ) { + name: "radioButton2" + "text": "text" + "selected": true + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 6 14" } ) }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 )