angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 23:07:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Typography: Demo: make typography/fonts visible in "screen shot" mode; hide password fields and labels

Browse Source
This commit is contained in:
Karl Tauber
2021-11-04 14:54:01 +01:00
parent 1be84de26b
commit 7a2808243c
2 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.java
View File

@@ -22,6 +22,10 @@ import javax.swing.text.DefaultEditorKit;
import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.extras.FlatSVGIcon; import com.formdev.flatlaf.extras.FlatSVGIcon;
import com.formdev.flatlaf.icons.FlatSearchIcon; import com.formdev.flatlaf.icons.FlatSearchIcon;
import net.miginfocom.layout.AC;
import net.miginfocom.layout.BoundSize;
import net.miginfocom.layout.ConstraintParser;
import net.miginfocom.layout.DimConstraint;
import net.miginfocom.swing.*; import net.miginfocom.swing.*;
/** /**
@@ -140,7 +144,7 @@ class BasicComponentsPanel
JLabel thinLabel = new JLabel(); JLabel thinLabel = new JLabel();
JLabel lightLabel = new JLabel(); JLabel lightLabel = new JLabel();
JLabel semiboldLabel = new JLabel(); JLabel semiboldLabel = new JLabel();
JLabel label3 = new JLabel(); JLabel fontZoomLabel = new JLabel();
JLabel largeLabel = new JLabel(); JLabel largeLabel = new JLabel();
JLabel defaultLabel = new JLabel(); JLabel defaultLabel = new JLabel();
JLabel mediumLabel = new JLabel(); JLabel mediumLabel = new JLabel();
@@ -735,11 +739,11 @@ class BasicComponentsPanel
semiboldLabel.putClientProperty("FlatLaf.style", "font: 200% $semibold.font"); semiboldLabel.putClientProperty("FlatLaf.style", "font: 200% $semibold.font");
add(semiboldLabel, "cell 1 15 5 1"); add(semiboldLabel, "cell 1 15 5 1");
//---- label3 ---- //---- fontZoomLabel ----
label3.setText("(200%)"); fontZoomLabel.setText("(200%)");
label3.putClientProperty("FlatLaf.styleClass", "small"); fontZoomLabel.putClientProperty("FlatLaf.styleClass", "small");
label3.setEnabled(false); fontZoomLabel.setEnabled(false);
add(label3, "cell 1 15 5 1"); add(fontZoomLabel, "cell 1 15 5 1");
//---- largeLabel ---- //---- largeLabel ----
largeLabel.setText("large"); largeLabel.setText("large");
@@ -808,37 +812,55 @@ class BasicComponentsPanel
if( FlatLafDemo.screenshotsMode ) { if( FlatLafDemo.screenshotsMode ) {
// hide some components // hide some components
Component[] hiddenComponents = { Component[] hiddenComponents = {
labelLabel, label1, label2,
button13, button14, button15, button16, comboBox5, comboBox6, button13, button14, button15, button16, comboBox5, comboBox6,
textField6, passwordField5,
textFieldLabel, textField2, textField4, textField6,
formattedTextFieldLabel, formattedTextField1, formattedTextField2, formattedTextField3, formattedTextField4, formattedTextField5, formattedTextFieldLabel, formattedTextField1, formattedTextField2, formattedTextField3, formattedTextField4, formattedTextField5,
passwordFieldLabel, passwordField1, passwordField2, passwordField3, passwordField4, passwordField5,
textAreaLabel, scrollPane1, scrollPane2, scrollPane3, scrollPane4, textArea5, textAreaLabel, scrollPane1, scrollPane2, scrollPane3, scrollPane4, textArea5,
editorPaneLabel, scrollPane5, scrollPane6, scrollPane7, scrollPane8, editorPane5, editorPaneLabel, scrollPane5, scrollPane6, scrollPane7, scrollPane8, editorPane5,
textPaneLabel, scrollPane9, scrollPane10, scrollPane11, scrollPane12, textPane5, textPaneLabel, scrollPane9, scrollPane10, scrollPane11, scrollPane12, textPane5,
errorHintsLabel, errorHintsTextField, errorHintsComboBox, errorHintsSpinner, errorHintsLabel, errorHintsTextField, errorHintsComboBox, errorHintsSpinner,
warningHintsLabel, warningHintsTextField, warningHintsComboBox, warningHintsSpinner, warningHintsLabel, warningHintsTextField, warningHintsComboBox, warningHintsSpinner,
fontZoomLabel,
}; };
for( Component c : hiddenComponents ) for( Component c : hiddenComponents )
c.setVisible( false ); c.setVisible( false );
// move leading/trailing icon fields and password fields some rows up // update layout (change row gaps to zero)
Component[] formattedTextFields = { formattedTextFieldLabel, formattedTextField1, formattedTextField2, formattedTextField3, formattedTextField4 };
Component[] passwordFields = { passwordFieldLabel, passwordField1, passwordField2, passwordField3, passwordField4 };
Component[] iconsFields = { iconsLabel, leadingIconTextField, trailingIconTextField, iconsTextField };
MigLayout layout = (MigLayout) getLayout(); MigLayout layout = (MigLayout) getLayout();
for( int i = 0; i < iconsFields.length; i++ ) { Object rowCons = layout.getRowConstraints();
Object cons = layout.getComponentConstraints( passwordFields[i] ); AC ac = (rowCons instanceof String)
layout.setComponentConstraints( iconsFields[i], cons ); ? ConstraintParser.parseColumnConstraints( (String) rowCons )
} : (AC) rowCons;
for( int i = 0; i < passwordFields.length; i++ ) { BoundSize zeroGap = ConstraintParser.parseBoundSize( "0", true, true );
Object cons = layout.getComponentConstraints( formattedTextFields[i] ); DimConstraint[] rows = ac.getConstaints();
layout.setComponentConstraints( passwordFields[i], cons ); rows[6].setGapBefore( zeroGap );
} rows[7].setGapBefore( zeroGap );
rows[8].setGapBefore( zeroGap );
rows[9].setGapBefore( zeroGap );
rows[10].setGapBefore( zeroGap );
rows[11].setGapBefore( zeroGap );
rows[11].setGapAfter( zeroGap );
rows[12].setGapBefore( zeroGap );
rows[13].setGapBefore( zeroGap );
rows[15].setGapBefore( zeroGap );
layout.setRowConstraints( ac );
// move two text field into same row as spinners
spinnerLabel.setText( "JSpinner / JTextField:" );
layout.setComponentConstraints( textField1, "cell 3 5,growx" );
layout.setComponentConstraints( textField3, "cell 4 5,growx" );
// make "Not editable disabled" combobox smaller // make "Not editable disabled" combobox smaller
Object cons = layout.getComponentConstraints( comboBox4 ); Object cons = layout.getComponentConstraints( comboBox4 );
layout.setComponentConstraints( comboBox4, cons + ",width 50:50" ); layout.setComponentConstraints( comboBox4, cons + ",width 50:50" );
revalidate();
repaint();
} }
} }

2
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.jfd
View File

@@ -741,7 +741,7 @@ new FormModel {
"value": "cell 1 15 5 1" "value": "cell 1 15 5 1"
} ) } )
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "label3" name: "fontZoomLabel"
"text": "(200%)" "text": "(200%)"
"$client.FlatLaf.styleClass": "small" "$client.FlatLaf.styleClass": "small"
"enabled": false "enabled": false