Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 22:40:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fonts: added Roboto Mono (issue #638)

Browse Source
This commit is contained in:
Karl Tauber
2023-01-12 14:08:08 +01:00
parent ede9293377
commit 4e1e749094
21 changed files with 581 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flatlaf-testing/build.gradle.kts
View File

@@ -27,6 +27,7 @@ dependencies {
implementation( project( ":flatlaf-fonts-inter" ) )
implementation( project( ":flatlaf-fonts-jetbrains-mono" ) )
implementation( project( ":flatlaf-fonts-roboto" ) )
implementation( project( ":flatlaf-fonts-roboto-mono" ) )
implementation( project( ":flatlaf-swingx" ) )
implementation( project( ":flatlaf-jide-oss" ) )
implementation( project( ":flatlaf-intellij-themes" ) )

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java
View File

@@ -25,6 +25,7 @@ import javax.swing.*;
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
import com.formdev.flatlaf.fonts.roboto.FlatRobotoFont;
import com.formdev.flatlaf.fonts.roboto_mono.FlatRobotoMonoFont;
import com.formdev.flatlaf.util.FontUtils;
import com.formdev.flatlaf.util.UIScale;
import net.miginfocom.swing.*;
@@ -40,6 +41,7 @@ public class FlatFontsTest
FlatInterFont.installLazy();
FlatJetBrainsMonoFont.installLazy();
FlatRobotoFont.installLazy();
FlatRobotoMonoFont.installLazy();
FlatTestFrame frame = FlatTestFrame.create( args, "FlatFontsTest" );
frame.showFrame( FlatFontsTest::new );

6
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java
View File

@@ -31,6 +31,7 @@ import com.formdev.flatlaf.FlatSystemProperties;
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
import com.formdev.flatlaf.fonts.roboto.FlatRobotoFont;
import com.formdev.flatlaf.fonts.roboto_mono.FlatRobotoMonoFont;
import com.formdev.flatlaf.util.FontUtils;
import com.formdev.flatlaf.util.Graphics2DProxy;
import com.formdev.flatlaf.util.HiDPIUtils;
@@ -53,6 +54,7 @@ public class FlatPaintingStringTest
FlatInterFont.installLazy();
FlatJetBrainsMonoFont.installLazy();
FlatRobotoFont.installLazy();
FlatRobotoMonoFont.installLazy();
FlatTestFrame frame = FlatTestFrame.create( args, "FlatPaintingStringTest" );
@@ -91,7 +93,7 @@ public class FlatPaintingStringTest
// monospaced
"Monospaced", "Consolas", "Courier New", "Menlo", "Liberation Mono", "Ubuntu Mono",
FlatJetBrainsMonoFont.FAMILY,
FlatJetBrainsMonoFont.FAMILY, FlatRobotoMonoFont.FAMILY,
};
Arrays.sort( families, String.CASE_INSENSITIVE_ORDER );
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
@@ -242,7 +244,7 @@ public class FlatPaintingStringTest
panel1.add(fontLabel, "cell 0 0");
//---- fontField ----
fontField.setMaximumRowCount(20);
fontField.setMaximumRowCount(25);
fontField.addActionListener(e -> fontChanged());
panel1.add(fontField, "cell 1 0");

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.jfd
View File

@@ -27,7 +27,7 @@ new FormModel {
} )
add( new FormComponent( "javax.swing.JComboBox" ) {
name: "fontField"
"maximumRowCount": 20
"maximumRowCount": 25
auxiliary() {
"JavaCodeGenerator.variableLocal": false
"JavaCodeGenerator.typeParameters": "String"