Sider: text baseline layout in FlatComponentsTest

This commit is contained in:
Karl Tauber
2020-12-04 21:08:12 +01:00
parent 1fb0783808
commit 91dbf1e144
2 changed files with 19 additions and 8 deletions

View File

@@ -286,6 +286,7 @@ public class FlatComponentsTest
JLabel sliderLabel = new JLabel(); JLabel sliderLabel = new JLabel();
JSlider slider1 = new JSlider(); JSlider slider1 = new JSlider();
JSlider slider6 = new JSlider(); JSlider slider6 = new JSlider();
JLabel sliderLabel2 = new JLabel();
slider3 = new JSlider(); slider3 = new JSlider();
JSlider slider5 = new JSlider(); JSlider slider5 = new JSlider();
JLabel progressBarLabel = new JLabel(); JLabel progressBarLabel = new JLabel();
@@ -1200,12 +1201,16 @@ public class FlatComponentsTest
//---- slider1 ---- //---- slider1 ----
slider1.setValue(30); slider1.setValue(30);
add(slider1, "cell 1 19 3 1,aligny top,grow 100 0"); add(slider1, "cell 1 19 3 1,growx");
//---- slider6 ---- //---- slider6 ----
slider6.setEnabled(false); slider6.setEnabled(false);
slider6.setValue(30); slider6.setValue(30);
add(slider6, "cell 1 19 3 1,aligny top,growy 0"); add(slider6, "cell 1 19 3 1");
//---- sliderLabel2 ----
sliderLabel2.setText("baseline");
add(sliderLabel2, "cell 0 20,alignx right,growx 0");
//---- slider3 ---- //---- slider3 ----
slider3.setMinorTickSpacing(10); slider3.setMinorTickSpacing(10);
@@ -1214,7 +1219,7 @@ public class FlatComponentsTest
slider3.setPaintLabels(true); slider3.setPaintLabels(true);
slider3.setValue(30); slider3.setValue(30);
slider3.addChangeListener(e -> changeProgress()); slider3.addChangeListener(e -> changeProgress());
add(slider3, "cell 1 20 3 1,aligny top,grow 100 0"); add(slider3, "cell 1 20 3 1,growx");
//---- slider5 ---- //---- slider5 ----
slider5.setMinorTickSpacing(10); slider5.setMinorTickSpacing(10);
@@ -1223,7 +1228,7 @@ public class FlatComponentsTest
slider5.setPaintLabels(true); slider5.setPaintLabels(true);
slider5.setEnabled(false); slider5.setEnabled(false);
slider5.setValue(30); slider5.setValue(30);
add(slider5, "cell 1 20 3 1,aligny top,growy 0"); add(slider5, "cell 1 20 3 1");
//---- progressBarLabel ---- //---- progressBarLabel ----
progressBarLabel.setText("JProgressBar:"); progressBarLabel.setText("JProgressBar:");

View File

@@ -1141,14 +1141,20 @@ new FormModel {
name: "slider1" name: "slider1"
"value": 30 "value": 30
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 19 3 1,aligny top,grow 100 0" "value": "cell 1 19 3 1,growx"
} ) } )
add( new FormComponent( "javax.swing.JSlider" ) { add( new FormComponent( "javax.swing.JSlider" ) {
name: "slider6" name: "slider6"
"enabled": false "enabled": false
"value": 30 "value": 30
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 19 3 1,aligny top,growy 0" "value": "cell 1 19 3 1"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "sliderLabel2"
"text": "baseline"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 20,alignx right,growx 0"
} ) } )
add( new FormComponent( "javax.swing.JSlider" ) { add( new FormComponent( "javax.swing.JSlider" ) {
name: "slider3" name: "slider3"
@@ -1162,7 +1168,7 @@ new FormModel {
} }
addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "changeProgress", false ) ) addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "changeProgress", false ) )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 20 3 1,aligny top,grow 100 0" "value": "cell 1 20 3 1,growx"
} ) } )
add( new FormComponent( "javax.swing.JSlider" ) { add( new FormComponent( "javax.swing.JSlider" ) {
name: "slider5" name: "slider5"
@@ -1173,7 +1179,7 @@ new FormModel {
"enabled": false "enabled": false
"value": 30 "value": 30
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 20 3 1,aligny top,growy 0" "value": "cell 1 20 3 1"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "progressBarLabel" name: "progressBarLabel"