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 2df78574..643bcf55 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 @@ -16,6 +16,9 @@ package com.formdev.flatlaf.testing; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.EventQueue; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.Transferable; @@ -91,6 +94,33 @@ public class FlatComponents2Test table1.setColumnSelectionAllowed( columnSelectionCheckBox.isSelected() ); } + private void showHorizontalLinesChanged() { + table1.setShowHorizontalLines( showHorizontalLinesCheckBox.isSelected() ); + } + + private void showVerticalLinesChanged() { + table1.setShowVerticalLines( showVerticalLinesCheckBox.isSelected() ); + } + + private void intercellSpacingChanged() { + table1.setIntercellSpacing( intercellSpacingCheckBox.isSelected() ? new Dimension( 1, 1 ) : new Dimension() ); + } + + private void redGridColorChanged() { + table1.setGridColor( redGridColorCheckBox.isSelected() ? Color.red : UIManager.getColor( "Table.gridColor" ) ); + } + + @Override + public void updateUI() { + super.updateUI(); + + EventQueue.invokeLater( () -> { + showHorizontalLinesChanged(); + showVerticalLinesChanged(); + intercellSpacingChanged(); + } ); + } + @SuppressWarnings( { "unchecked", "rawtypes" } ) private void initComponents() { // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents @@ -114,6 +144,10 @@ public class FlatComponents2Test tableHeaderButtonCheckBox = new JCheckBox(); rowSelectionCheckBox = new JCheckBox(); columnSelectionCheckBox = new JCheckBox(); + showHorizontalLinesCheckBox = new JCheckBox(); + showVerticalLinesCheckBox = new JCheckBox(); + intercellSpacingCheckBox = new JCheckBox(); + redGridColorCheckBox = new JCheckBox(); //======== this ======== setLayout(new MigLayout( @@ -127,6 +161,7 @@ public class FlatComponents2Test "[]" + "[::200]" + "[150,grow]" + + "[]" + "[]")); //---- textFieldLabel ---- @@ -333,6 +368,26 @@ public class FlatComponents2Test columnSelectionCheckBox.setText("column selection"); columnSelectionCheckBox.addActionListener(e -> columnSelectionChanged()); add(columnSelectionCheckBox, "cell 0 4 3 1"); + + //---- showHorizontalLinesCheckBox ---- + showHorizontalLinesCheckBox.setText("show horizontal lines"); + showHorizontalLinesCheckBox.addActionListener(e -> showHorizontalLinesChanged()); + add(showHorizontalLinesCheckBox, "cell 0 5 3 1"); + + //---- showVerticalLinesCheckBox ---- + showVerticalLinesCheckBox.setText("show vertical lines"); + showVerticalLinesCheckBox.addActionListener(e -> showVerticalLinesChanged()); + add(showVerticalLinesCheckBox, "cell 0 5 3 1"); + + //---- intercellSpacingCheckBox ---- + intercellSpacingCheckBox.setText("intercell spacing"); + intercellSpacingCheckBox.addActionListener(e -> intercellSpacingChanged()); + add(intercellSpacingCheckBox, "cell 0 5 3 1"); + + //---- redGridColorCheckBox ---- + redGridColorCheckBox.setText("red grid color"); + redGridColorCheckBox.addActionListener(e -> redGridColorChanged()); + add(redGridColorCheckBox, "cell 0 5 3 1"); // JFormDesigner - End of component initialization //GEN-END:initComponents ((JComboBox)((DefaultCellEditor)table1.getColumnModel().getColumn( 3 ).getCellEditor()).getComponent()).setEditable( true ); @@ -349,6 +404,10 @@ public class FlatComponents2Test private JCheckBox tableHeaderButtonCheckBox; private JCheckBox rowSelectionCheckBox; private JCheckBox columnSelectionCheckBox; + private JCheckBox showHorizontalLinesCheckBox; + private JCheckBox showVerticalLinesCheckBox; + private JCheckBox intercellSpacingCheckBox; + private JCheckBox redGridColorCheckBox; // JFormDesigner - End of variables declaration //GEN-END:variables //---- class DummyTransferHandler ----------------------------------------- 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 d3a970fb..ed3bbc88 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 @@ -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" @@ -9,7 +9,7 @@ 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][]" + "$rowConstraints": "[][][::200][150,grow][][]" } ) { name: "this" add( new FormComponent( "javax.swing.JLabel" ) { @@ -316,6 +316,46 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 0 4 3 1" } ) + add( new FormComponent( "javax.swing.JCheckBox" ) { + name: "showHorizontalLinesCheckBox" + "text": "show horizontal lines" + auxiliary() { + "JavaCodeGenerator.variableLocal": false + } + addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showHorizontalLinesChanged", false ) ) + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 5 3 1" + } ) + add( new FormComponent( "javax.swing.JCheckBox" ) { + name: "showVerticalLinesCheckBox" + "text": "show vertical lines" + auxiliary() { + "JavaCodeGenerator.variableLocal": false + } + addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showVerticalLinesChanged", false ) ) + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 5 3 1" + } ) + add( new FormComponent( "javax.swing.JCheckBox" ) { + name: "intercellSpacingCheckBox" + "text": "intercell spacing" + auxiliary() { + "JavaCodeGenerator.variableLocal": false + } + addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "intercellSpacingChanged", false ) ) + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 5 3 1" + } ) + add( new FormComponent( "javax.swing.JCheckBox" ) { + name: "redGridColorCheckBox" + "text": "red grid color" + auxiliary() { + "JavaCodeGenerator.variableLocal": false + } + addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "redGridColorChanged", false ) ) + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 5 3 1" + } ) }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 ) "size": new java.awt.Dimension( 790, 715 )