From b66139281dd38b308afc1178fc483c82ee9c73f9 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 17 Sep 2020 13:50:56 +0200 Subject: [PATCH] FlatHtmlTest: fixed labels and added HTML tooltips --- .../formdev/flatlaf/testing/FlatHtmlTest.java | 27 ++++++++++++++++-- .../formdev/flatlaf/testing/FlatHtmlTest.jfd | 28 ++++++++++++++++--- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java index f0c4cac7..72fd3b19 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java @@ -86,6 +86,9 @@ public class FlatHtmlTest label10 = new JLabel(); radioButtonMenuItem1 = new JRadioButtonMenuItem(); radioButtonMenuItem2 = new JRadioButtonMenuItem(); + label14 = new JLabel(); + label15 = new JLabel(); + label16 = new JLabel(); label1 = new JLabel(); scrollPane15 = new JScrollPane(); editorPane1 = new JEditorPane(); @@ -146,6 +149,7 @@ public class FlatHtmlTest "[]" + "[]" + "[]" + + "[]" + "[]")); //---- label5 ---- @@ -173,7 +177,7 @@ public class FlatHtmlTest panel1.add(button2, "cell 2 1"); //---- label11 ---- - label11.setText("text"); + label11.setText("JToggleButton:"); panel1.add(label11, "cell 0 2"); //---- toggleButton1 ---- @@ -187,7 +191,7 @@ public class FlatHtmlTest panel1.add(toggleButton2, "cell 2 2"); //---- label12 ---- - label12.setText("text"); + label12.setText("JCheckBox:"); panel1.add(label12, "cell 0 3"); //---- checkBox1 ---- @@ -199,7 +203,7 @@ public class FlatHtmlTest panel1.add(checkBox2, "cell 2 3"); //---- label13 ---- - label13.setText("text"); + label13.setText("JRadioButton:"); panel1.add(label13, "cell 0 4"); //---- radioButton1 ---- @@ -265,6 +269,20 @@ public class FlatHtmlTest radioButtonMenuItem2.setText("Some text"); radioButtonMenuItem2.setSelected(true); panel1.add(radioButtonMenuItem2, "cell 2 8"); + + //---- label14 ---- + label14.setText("JToolTip:"); + panel1.add(label14, "cell 0 9"); + + //---- label15 ---- + label15.setText("(move mouse here)"); + label15.setToolTipText("Some Bold Text"); + panel1.add(label15, "cell 1 9"); + + //---- label16 ---- + label16.setText("(move mouse here)"); + label16.setToolTipText("Some text"); + panel1.add(label16, "cell 2 9"); } add(panel1, "cell 4 0 1 3,aligny top,growy 0"); @@ -379,6 +397,9 @@ public class FlatHtmlTest private JLabel label10; private JRadioButtonMenuItem radioButtonMenuItem1; private JRadioButtonMenuItem radioButtonMenuItem2; + private JLabel label14; + private JLabel label15; + private JLabel label16; private JLabel label1; private JScrollPane scrollPane15; private JEditorPane editorPane1; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd index 7ff2c3e3..785f930a 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd @@ -36,7 +36,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$layoutConstraints": "insets 0,hidemode 3" "$columnConstraints": "[fill][fill][fill]" - "$rowConstraints": "[][][][][][][][][]" + "$rowConstraints": "[][][][][][][][][][]" } ) { name: "panel1" add( new FormComponent( "javax.swing.JLabel" ) { @@ -77,7 +77,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label11" - "text": "text" + "text": "JToggleButton:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 0 2" } ) @@ -97,7 +97,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label12" - "text": "text" + "text": "JCheckBox:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 0 3" } ) @@ -115,7 +115,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label13" - "text": "text" + "text": "JRadioButton:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 0 4" } ) @@ -207,6 +207,26 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 2 8" } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label14" + "text": "JToolTip:" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 9" + } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label15" + "text": "(move mouse here)" + "toolTipText": "Some Bold Text" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 1 9" + } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "label16" + "text": "(move mouse here)" + "toolTipText": "Some text" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 9" + } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 4 0 1 3,aligny top,growy 0" } )