diff --git a/.gitattributes b/.gitattributes index 7728e3877..62ac17da4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,7 +20,9 @@ *.gif binary *.jar binary *.lib binary +*.otf binary *.png binary *.sketch binary *.so binary +*.ttf binary *.zip binary diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1369436f9..d8d6fc392 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,7 @@ jobs: name: FlatLaf-build-artifacts path: | flatlaf-*/build/libs + flatlaf-*/flatlaf-*/build/libs !**/*-javadoc.jar !**/*-sources.jar diff --git a/.github/workflows/fonts.yml b/.github/workflows/fonts.yml new file mode 100644 index 000000000..f48e27a1e --- /dev/null +++ b/.github/workflows/fonts.yml @@ -0,0 +1,47 @@ +# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Fonts + +on: + push: + branches: + - '*' + tags: + - 'fonts/*-[0-9]*' + paths: + - 'flatlaf-fonts/**' + - '.github/workflows/fonts.yml' + +jobs: + Release: + runs-on: ubuntu-latest + if: | + github.event_name == 'push' && + github.repository == 'JFormDesigner/FlatLaf' + + strategy: + matrix: + font: + - inter + - jetbrains-mono + + steps: + - uses: actions/checkout@v3 + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) + + - name: Setup Java 11 + uses: actions/setup-java@v3 + with: + java-version: 11 + distribution: adopt # pre-installed on ubuntu-latest + cache: gradle + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) + + - name: Release a new stable version to Maven Central + run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build :flatlaf-fonts-${{ matrix.font }}:publish -Drelease=true + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) diff --git a/README.md b/README.md index 72e94fc78..d383098a8 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,8 @@ Addons - [SwingX](flatlaf-swingx) - support for SwingX components - [JIDE Common Layer](flatlaf-jide-oss) - support for JIDE Common Layer components +- [Fonts](flatlaf-fonts) - some font families bundled in easy-to-use and + redistributable JARs Getting started diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index 8abd2ad39..b39901ec9 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -114,6 +114,11 @@ public abstract class FlatLaf private Consumer postInitialization; private List> uiDefaultsGetters; + private static String preferredFontFamily; + private static String preferredLightFontFamily; + private static String preferredSemiboldFontFamily; + private static String preferredMonospacedFontFamily; + /** * Sets the application look and feel to the given LaF * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}. @@ -631,6 +636,13 @@ private void initDefaultFont( UIDefaults defaults ) { if( uiFont == null ) uiFont = createCompositeFont( Font.SANS_SERIF, Font.PLAIN, 12 ); + // use preferred font family (if specified) + if( preferredFontFamily != null ) { + FontUIResource preferredFont = createCompositeFont( preferredFontFamily, uiFont.getStyle(), uiFont.getSize() ); + if( !ActiveFont.isFallbackFont( preferredFont ) || ActiveFont.isDialogFamily( preferredFontFamily ) ) + uiFont = preferredFont; + } + // get/remove "defaultFont" from defaults if set in properties files // (use remove() to avoid that ActiveFont.createValue() gets invoked) Object defaultFont = defaults.remove( "defaultFont" ); @@ -1323,6 +1335,90 @@ private static StyleableUI getStyleableUI( JComponent c ) { private static boolean getUIMethodInitialized; private static MethodHandle getUIMethod; + /** + * Returns the preferred font family to be used for (nearly) all fonts; or {@code null}. + * + * @since 3 + */ + public static String getPreferredFontFamily() { + return preferredFontFamily; + } + + /** + * Sets the preferred font family to be used for (nearly) all fonts. + *

+ * Note: This must be invoked before setting + * the application look and feel. + * + * @since 3 + */ + public static void setPreferredFontFamily( String preferredFontFamily ) { + FlatLaf.preferredFontFamily = preferredFontFamily; + } + + /** + * Returns the preferred font family to be used for "light" fonts; or {@code null}. + * + * @since 3 + */ + public static String getPreferredLightFontFamily() { + return preferredLightFontFamily; + } + + /** + * Sets the preferred font family to be used for "light" fonts. + *

+ * Note: This must be invoked before setting + * the application look and feel. + * + * @since 3 + */ + public static void setPreferredLightFontFamily( String preferredLightFontFamily ) { + FlatLaf.preferredLightFontFamily = preferredLightFontFamily; + } + + /** + * Returns the preferred font family to be used for "semibold" fonts; or {@code null}. + * + * @since 3 + */ + public static String getPreferredSemiboldFontFamily() { + return preferredSemiboldFontFamily; + } + + /** + * Sets the preferred font family to be used for "semibold" fonts. + *

+ * Note: This must be invoked before setting + * the application look and feel. + * + * @since 3 + */ + public static void setPreferredSemiboldFontFamily( String preferredSemiboldFontFamily ) { + FlatLaf.preferredSemiboldFontFamily = preferredSemiboldFontFamily; + } + + /** + * Returns the preferred font family to be used for monospaced fonts; or {@code null}. + * + * @since 3 + */ + public static String getPreferredMonospacedFontFamily() { + return preferredMonospacedFontFamily; + } + + /** + * Sets the preferred font family to be used for monospaced fonts. + *

+ * Note: This must be invoked before setting + * the application look and feel. + * + * @since 3 + */ + public static void setPreferredMonospacedFontFamily( String preferredMonospacedFontFamily ) { + FlatLaf.preferredMonospacedFontFamily = preferredMonospacedFontFamily; + } + //---- class FlatUIDefaults ----------------------------------------------- private class FlatUIDefaults @@ -1457,9 +1553,16 @@ FontUIResource derive( Font baseFont, IntUnaryOperator scale ) { // create font for family if( families != null && !families.isEmpty() ) { + String preferredFamily = preferredFamily( families ); + if( preferredFamily != null ) { + Font font = createCompositeFont( preferredFamily, newStyle, newSize ); + if( !isFallbackFont( font ) || isDialogFamily( preferredFamily ) ) + return toUIResource( font ); + } + for( String family : families ) { Font font = createCompositeFont( family, newStyle, newSize ); - if( !isFallbackFont( font ) || family.equalsIgnoreCase( Font.DIALOG ) ) + if( !isFallbackFont( font ) || isDialogFamily( family ) ) return toUIResource( font ); } } @@ -1488,9 +1591,26 @@ private FontUIResource toUIResource( Font font ) { : new FontUIResource( font ); } - private boolean isFallbackFont( Font font ) { + private static boolean isFallbackFont( Font font ) { return Font.DIALOG.equalsIgnoreCase( font.getFamily() ); } + + private static boolean isDialogFamily( String family ) { + return family.equalsIgnoreCase( Font.DIALOG ); + } + + private static String preferredFamily( List families ) { + for( String family : families ) { + family = family.toLowerCase( Locale.ENGLISH ); + if( family.endsWith( " light" ) || family.endsWith( "-thin" ) ) + return preferredLightFontFamily; + if( family.endsWith( " semibold" ) || family.endsWith( "-medium" ) ) + return preferredSemiboldFontFamily; + if( family.equals( "monospaced" ) ) + return preferredMonospacedFontFamily; + } + return null; + } } //---- class ImageIconUIResource ------------------------------------------ diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java index c46715184..16fec05af 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java @@ -16,6 +16,7 @@ package com.formdev.flatlaf.util; +import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.font.GlyphVector; @@ -141,37 +142,101 @@ public static float computeTextYCorrection( Graphics2D g ) { if( !useTextYCorrection() || !SystemInfo.isWindows ) return 0; - if( !SystemInfo.isJava_9_orLater ) - return UIScale.getUserScaleFactor() > 1 ? -UIScale.scale( 0.625f ) : 0; + if( !SystemInfo.isJava_9_orLater ) { + // Java 8 + float scaleFactor = getUserScaleFactor(); + if( scaleFactor > 1 ) { + switch( g.getFont().getFamily() ) { + case "Segoe UI": + case "Segoe UI Light": + case "Segoe UI Semibold": + return -((scaleFactor == 2.25f || scaleFactor == 4f ? 0.875f : 0.625f) * scaleFactor); + + case "Noto Sans": + case "Open Sans": + return -(0.3f * scaleFactor); + + case "Verdana": + return -((scaleFactor < 2 ? 0.4f : 0.3f) * scaleFactor); + } + } + } else { + // Java 9 and later + + // Text is painted at slightly different Y positions depending on scale factor + // and Y position of component. + // The exact reason is not yet known (to me), but there are several factors: + // - fractional scale factors result in fractional component Y device coordinates + // - fractional text Y device coordinates are rounded for horizontal lines of characters + // - maybe different rounding methods for drawing primitives (e.g. rectangle) and text + // - Java adds 0.5 to X/Y positions before drawing string in BufferedTextPipe.enqueueGlyphList() + + // this is not the optimal solution, but works very good in most cases + // (tested with class FlatPaintingStringTest on Windows 11) + + switch( g.getFont().getFamily() ) { + case "Segoe UI": + case "Segoe UI Light": + case "Segoe UI Semibold": + case "Verdana": + case Font.DIALOG: + case Font.SANS_SERIF: + return correctionForScaleY( g, CORRECTION_SEGOE_UI ); + + case "Tahoma": + return correctionForScaleY( g, CORRECTION_TAHOMA ); + + case "Inter": + case "Inter Light": + case "Inter Semi Bold": + case "Roboto": + return correctionForScaleY( g, CORRECTION_INTER ); + + case "Noto Sans": + case "Open Sans": + return correctionForScaleY( g, CORRECTION_OPEN_SANS ); + } + } - AffineTransform t = g.getTransform(); - double scaleY = t.getScaleY(); - if( scaleY < 1.25 ) - return 0; + return 0; + } + + private static final float[] + SCALE_FACTORS = { 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 3f, 3.5f, 4f }, + + CORRECTION_SEGOE_UI = { -0.5f, -0.5f, -0.625f, -0.75f, -0.75f, -0.75f, -0.75f, -0.75f, -0.875f }, + CORRECTION_TAHOMA = { -0.25f, -0.25f, -0.25f, -0f, -0.125f, -0.125f, -0.125f, -0.125f, -0f }, + CORRECTION_INTER = { -0.25f, -0.25f, -0.25f, -0f, -0.125f, -0.125f, -0f, -0.25f, -0f }, + CORRECTION_OPEN_SANS = { -0.5f, -0.25f, -0.25f, -0f, -0.25f, -0.25f, -0f, -0.25f, -0.25f }; + + private static float correctionForScaleY( Graphics2D g, float[] correction ) { + if( correction.length != 9 ) + throw new IllegalArgumentException(); + + double scaleY = g.getTransform().getScaleY(); + return (scaleY < 1.25) ? 0 : correction[scaleFactor2index( (float) scaleY )]; + } + + private static int scaleFactor2index( float scaleFactor ) { + for( int i = 0; i < SCALE_FACTORS.length; i++ ) { + if( scaleFactor <= SCALE_FACTORS[i] ) + return i; + } + return SCALE_FACTORS.length - 1; + } + + private static Boolean useDebugScaleFactor; + + private static boolean useDebugScaleFactor() { + if( useDebugScaleFactor == null ) + useDebugScaleFactor = FlatSystemProperties.getBoolean( "FlatLaf.debug.HiDPIUtils.useDebugScaleFactor", false ); + return useDebugScaleFactor; + } - // Text is painted at slightly different Y positions depending on scale factor - // and Y position of component. - // The exact reason is not yet known (to me), but there are several factors: - // - fractional scale factors result in fractional component Y device coordinates - // - fractional text Y device coordinates are rounded for horizontal lines of characters - // - maybe different rounding methods for drawing primitives (e.g. rectangle) and text - // - Java adds 0.5 to X/Y positions before drawing string in BufferedTextPipe.enqueueGlyphList() - - // this is not the optimal solution, but works very good in most cases - // (tested with class FlatPaintingStringTest on Windows 10 with font "Segoe UI") - if( scaleY <= 1.25 ) - return -0.875f; - if( scaleY <= 1.5 ) - return -0.625f; - if( scaleY <= 1.75 ) - return -0.875f; - if( scaleY <= 2.0 ) - return -0.75f; - if( scaleY <= 2.25 ) - return -0.875f; - if( scaleY <= 3.5 ) - return -0.75f; - return -0.875f; + private static float getUserScaleFactor() { + return !useDebugScaleFactor() + ? UIScale.getUserScaleFactor() + : Float.parseFloat( System.getProperty( "FlatLaf.debug.HiDPIUtils.debugScaleFactor", "1" ) ); } /** diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts index 276e3a257..b24732266 100644 --- a/flatlaf-demo/build.gradle.kts +++ b/flatlaf-demo/build.gradle.kts @@ -22,6 +22,7 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( project( ":flatlaf-extras" ) ) + implementation( project( ":flatlaf-fonts-inter" ) ) implementation( project( ":flatlaf-intellij-themes" ) ) implementation( "com.miglayout:miglayout-swing:5.3" ) implementation( "com.jgoodies:jgoodies-forms:1.9.0" ) @@ -32,6 +33,7 @@ tasks { jar { dependsOn( ":flatlaf-core:jar" ) dependsOn( ":flatlaf-extras:jar" ) + dependsOn( ":flatlaf-fonts-inter:jar" ) dependsOn( ":flatlaf-intellij-themes:jar" ) // dependsOn( ":flatlaf-natives-jna:jar" ) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java index f65def732..a8f5851fa 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java @@ -43,6 +43,7 @@ import com.formdev.flatlaf.extras.FlatUIDefaultsInspector; import com.formdev.flatlaf.extras.components.FlatButton; import com.formdev.flatlaf.extras.components.FlatButton.ButtonType; +import com.formdev.flatlaf.fonts.inter.FlatInterFont; import com.formdev.flatlaf.icons.FlatAbstractIcon; import com.formdev.flatlaf.themes.FlatMacDarkLaf; import com.formdev.flatlaf.themes.FlatMacLightLaf; @@ -64,6 +65,7 @@ class DemoFrame extends JFrame { private final String[] availableFontFamilyNames; + private boolean interFontInstalled; private int initialFontMenuItemCount = -1; DemoFrame() { @@ -280,6 +282,12 @@ private void showHintsChanged() { private void fontFamilyChanged( ActionEvent e ) { String fontFamily = e.getActionCommand(); + // install Inter font on demand + if( fontFamily.equals( FlatInterFont.FAMILY ) && !interFontInstalled ) { + FlatInterFont.install(); + interFontInstalled = true; + } + FlatAnimatedLafChange.showSnapshot(); Font font = UIManager.getFont( "defaultFont" ); @@ -344,7 +352,7 @@ void updateFontMenuItems() { fontMenu.addSeparator(); ArrayList families = new ArrayList<>( Arrays.asList( "Arial", "Cantarell", "Comic Sans MS", "DejaVu Sans", - "Dialog", "Liberation Sans", "Noto Sans", "Roboto", + "Dialog", "Inter", "Liberation Sans", "Noto Sans", "Open Sans", "Roboto", "SansSerif", "Segoe UI", "Serif", "Tahoma", "Ubuntu", "Verdana" ) ); if( !families.contains( currentFamily ) ) families.add( currentFamily ); @@ -352,8 +360,9 @@ void updateFontMenuItems() { ButtonGroup familiesGroup = new ButtonGroup(); for( String family : families ) { - if( Arrays.binarySearch( availableFontFamilyNames, family ) < 0 ) - continue; // not available + if( Arrays.binarySearch( availableFontFamilyNames, family ) < 0 && + !family.equals( FlatInterFont.FAMILY ) ) + continue; // not available JCheckBoxMenuItem item = new JCheckBoxMenuItem( family ); item.setSelected( family.equals( currentFamily ) ); diff --git a/flatlaf-fonts/README.md b/flatlaf-fonts/README.md new file mode 100644 index 000000000..fb4d94ebb --- /dev/null +++ b/flatlaf-fonts/README.md @@ -0,0 +1,8 @@ +Fonts +===== + +The sub-projects contains fonts from some font families and bundles them into +easy-to-use and redistributable JARs. + +- [Inter](flatlaf-fonts-inter) font +- [JetBrains Mono](flatlaf-fonts-jetbrains-mono) font diff --git a/flatlaf-fonts/flatlaf-fonts-inter/README.md b/flatlaf-fonts/flatlaf-fonts-inter/README.md new file mode 100644 index 000000000..71742928c --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/README.md @@ -0,0 +1,79 @@ +Inter font +========== + +This sub-project contains fonts from the Inter font family and bundles them into +an easy-to-use and redistributable JAR. + +**Note**: This font does not work correctly in older Java 8 versions (before +8u212) and in Java 9 because it is displayed way too large. + +Font home page: https://rsms.me/inter/ + +GitHub project: https://github.com/rsms/inter + +License: +[SIL OPEN FONT LICENSE Version 1.1](src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt) + + +How to install? +--------------- + +Invoke the `install()` method once (e.g. in your `main()` method; on AWT +thread): + +~~~java +FlatInterFont.install(); +~~~ + + +How to use? +----------- + +Use as default font: + +~~~java +FlatLaf.setPreferredFontFamily( FlatInterFont.FAMILY ); +FlatLaf.setPreferredLightFontFamily( FlatInterFont.FAMILY_LIGHT ); +FlatLaf.setPreferredSemiboldFontFamily( FlatInterFont.FAMILY_SEMIBOLD ); +~~~ + +Create fonts: + +~~~java +// basic styles +new Font( FlatInterFont.FAMILY, Font.PLAIN, 12 ); +new Font( FlatInterFont.FAMILY, Font.ITALIC, 12 ); +new Font( FlatInterFont.FAMILY, Font.BOLD, 12 ); +new Font( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 12 ); + +// light +new Font( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 12 ); +new Font( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 12 ); + +// semibold +new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 12 ); +new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 12 ); +~~~ + + +Download +-------- + +Not yet available. + + diff --git a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts new file mode 100644 index 000000000..c55a7588c --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts @@ -0,0 +1,54 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Version format: [-] +// For maven compatibility, should be in format .[.]. +// is optional and should be incremented only if a new release is +// necessary, but the has not changed. +version = "3.19" + +plugins { + `java-library` + `flatlaf-module-info` + `flatlaf-publish` +} + +dependencies { + testImplementation( "org.junit.jupiter:junit-jupiter-api:5.7.2" ) + testImplementation( "org.junit.jupiter:junit-jupiter-params" ) + testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" ) +} + +java { + withSourcesJar() + withJavadocJar() +} + +tasks { + named( "sourcesJar" ) { + exclude( "**/*.ttf", "**/*.otf" ) + } + + test { + useJUnitPlatform() + testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + } +} + +flatlafPublish { + artifactId = "flatlaf-fonts-inter" + name = "FlatLaf Inter Fonts Pack" +} diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java b/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java new file mode 100644 index 000000000..b27d3ad7d --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/java/com/formdev/flatlaf/fonts/inter/FlatInterFont.java @@ -0,0 +1,153 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.inter; + +import java.awt.Font; +import java.awt.FontFormatException; +import java.awt.GraphicsEnvironment; +import java.io.IOException; +import java.io.InputStream; + +/** + * The Inter font family. + *

+ * Note: This font does not work correctly in older Java 8 versions + * (before 8u212) and in Java 9 because it is displayed way too large. + *

+ * Font home page: https://rsms.me/inter/
+ * GitHub project: https://github.com/rsms/inter + *

+ * To install the font, invoke following once (e.g. in your {@code main()} method; on AWT thread): + *

{@code
+ * FlatInterFont.install();
+ * }
+ *

+ * Use as default font: + *

{@code
+ * FlatLaf.setPreferredFontFamily( FlatInterFont.FAMILY );
+ * FlatLaf.setPreferredLightFontFamily( FlatInterFont.FAMILY_LIGHT );
+ * FlatLaf.setPreferredSemiboldFontFamily( FlatInterFont.FAMILY_SEMIBOLD );
+ * }
+ *

+ * Create fonts: + *

{@code
+ * new Font( FlatInterFont.FAMILY, Font.PLAIN, 12 );
+ * new Font( FlatInterFont.FAMILY, Font.ITALIC, 12 );
+ * new Font( FlatInterFont.FAMILY, Font.BOLD, 12 );
+ * new Font( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
+ * new Font( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 12 );
+ * new Font( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 12 );
+ * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 12 );
+ * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 12 );
+ * }
+ * + * @author Karl Tauber + */ +public class FlatInterFont +{ + /** + * Family name for basic styles (regular, italic and bold). + *

+ * Usage: + *

{@code
+	 * new Font( FlatInterFont.FAMILY, Font.PLAIN, 12 );
+	 * new Font( FlatInterFont.FAMILY, Font.ITALIC, 12 );
+	 * new Font( FlatInterFont.FAMILY, Font.BOLD, 12 );
+	 * new Font( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY = "Inter"; + + /** + * Family name for light styles. + *

+ * Usage: + *

{@code
+	 * new Font( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 12 );
+	 * new Font( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY_LIGHT = "Inter Light"; + + /** + * Family name for semibold styles. + *

+ * Usage: + *

{@code
+	 * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 12 );
+	 * new Font( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY_SEMIBOLD = "Inter Semi Bold"; + + /** + * Use for {@link #installStyle(String)} to install single font style. + */ + public static final String + // basic styles + STYLE_REGULAR = "Inter-Regular.otf", + STYLE_ITALIC = "Inter-Italic.otf", + STYLE_BOLD = "Inter-Bold.otf", + STYLE_BOLD_ITALIC = "Inter-BoldItalic.otf", + + // light + STYLE_LIGHT = "Inter-Light.otf", + STYLE_LIGHT_ITALIC = "Inter-LightItalic.otf", + + // semibold + STYLE_SEMIBOLD = "Inter-SemiBold.otf", + STYLE_SEMIBOLD_ITALIC = "Inter-SemiBoldItalic.otf"; + + + private FlatInterFont() {} + + /** + * Creates and registers the fonts for all styles. + */ + public static void install() { + // basic styles + installStyle( STYLE_REGULAR ); + installStyle( STYLE_ITALIC ); + installStyle( STYLE_BOLD ); + installStyle( STYLE_BOLD_ITALIC ); + + // light + installStyle( STYLE_LIGHT ); + installStyle( STYLE_LIGHT_ITALIC ); + + // semibold + installStyle( STYLE_SEMIBOLD ); + installStyle( STYLE_SEMIBOLD_ITALIC ); + } + + /** + * Creates and registers the font for the given style. + * See {@code STYLE_} constants. + */ + public static boolean installStyle( String name ) { + try( InputStream in = FlatInterFont.class.getResourceAsStream( name ) ) { + Font font = Font.createFont( Font.TRUETYPE_FONT, in ); + return GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont( font ); + } catch( FontFormatException ex ) { + ex.printStackTrace(); + return false; + } catch( IOException ex ) { + ex.printStackTrace(); + return false; + } + } +} diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/module-info/module-info.java b/flatlaf-fonts/flatlaf-fonts-inter/src/main/module-info/module-info.java new file mode 100644 index 000000000..468755203 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/module-info/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Karl Tauber + */ +module com.formdev.flatlaf.fonts.inter { + requires java.desktop; + + exports com.formdev.flatlaf.fonts.inter; + + opens com.formdev.flatlaf.fonts.inter; +} diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf new file mode 100644 index 000000000..c74cc0c6c Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Bold.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf new file mode 100644 index 000000000..20d20c195 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-BoldItalic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf new file mode 100644 index 000000000..39d6016be Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Italic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf new file mode 100644 index 000000000..2a83ae168 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Light.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf new file mode 100644 index 000000000..ca9fb1276 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-LightItalic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf new file mode 100644 index 000000000..84e6a61c3 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-Regular.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf new file mode 100644 index 000000000..daf4c4413 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBold.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf new file mode 100644 index 000000000..bc58b80d7 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/Inter-SemiBoldItalic.otf differ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt new file mode 100644 index 000000000..ff80f8c61 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/main/resources/com/formdev/flatlaf/fonts/inter/LICENSE.txt @@ -0,0 +1,94 @@ +Copyright (c) 2016-2020 The Inter Project Authors. +"Inter" is trademark of Rasmus Andersson. +https://github.com/rsms/inter + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION AND CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/flatlaf-fonts/flatlaf-fonts-inter/src/test/java/com/formdev/flatlaf/fonts/inter/TestFlatInterFont.java b/flatlaf-fonts/flatlaf-fonts-inter/src/test/java/com/formdev/flatlaf/fonts/inter/TestFlatInterFont.java new file mode 100644 index 000000000..b370ca50f --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-inter/src/test/java/com/formdev/flatlaf/fonts/inter/TestFlatInterFont.java @@ -0,0 +1,50 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.inter; + +import java.awt.Font; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author Karl Tauber + */ +class TestFlatInterFont +{ + @Test + void testFont() { + FlatInterFont.install(); + + testFont( FlatInterFont.FAMILY, Font.PLAIN, 13 ); + testFont( FlatInterFont.FAMILY, Font.ITALIC, 13 ); + testFont( FlatInterFont.FAMILY, Font.BOLD, 13 ); + testFont( FlatInterFont.FAMILY, Font.BOLD | Font.ITALIC, 13 ); + + testFont( FlatInterFont.FAMILY_LIGHT, Font.PLAIN, 13 ); + testFont( FlatInterFont.FAMILY_LIGHT, Font.ITALIC, 13 ); + + testFont( FlatInterFont.FAMILY_SEMIBOLD, Font.PLAIN, 13 ); + testFont( FlatInterFont.FAMILY_SEMIBOLD, Font.ITALIC, 13 ); + } + + private void testFont( String family, int style, int size ) { + Font actual = new Font( family, style, size ); + assertEquals( family, actual.getFamily() ); + assertEquals( style, actual.getStyle() ); + assertEquals( size, actual.getSize() ); + } +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md new file mode 100644 index 000000000..fb2c620e4 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md @@ -0,0 +1,66 @@ +JetBrains Mono font +=================== + +This sub-project contains fonts from the JetBrains Mono font family and bundles +them into an easy-to-use and redistributable JAR. + +Font home page: https://www.jetbrains.com/mono + +GitHub project: https://github.com/JetBrains/JetBrainsMono + +License: +[SIL OPEN FONT LICENSE Version 1.1](src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt) + + +How to install? +--------------- + +Invoke the `install()` method once (e.g. in your `main()` method; on AWT +thread): + +~~~java +FlatJetBrainsMonoFont.install(); +~~~ + + +How to use? +----------- + +Use as default monospaced font: + +~~~java +FlatLaf.setPreferredMonospacedFontFamily( FlatJetBrainsMonoFont.FAMILY ); +~~~ + +Create fonts: + +~~~java +// basic styles +new Font( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 12 ); +new Font( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 12 ); +new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 12 ); +new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 ); +~~~ + + +Download +-------- + +Not yet available. + + diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts new file mode 100644 index 000000000..e72cabc7c --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts @@ -0,0 +1,54 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Version format: [-] +// For maven compatibility, should be in format .[.]. +// is optional and should be incremented only if a new release is +// necessary, but the has not changed. +version = "2.242" + +plugins { + `java-library` + `flatlaf-module-info` + `flatlaf-publish` +} + +dependencies { + testImplementation( "org.junit.jupiter:junit-jupiter-api:5.7.2" ) + testImplementation( "org.junit.jupiter:junit-jupiter-params" ) + testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" ) +} + +java { + withSourcesJar() + withJavadocJar() +} + +tasks { + named( "sourcesJar" ) { + exclude( "**/*.ttf", "**/*.otf" ) + } + + test { + useJUnitPlatform() + testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + } +} + +flatlafPublish { + artifactId = "flatlaf-fonts-jetbrains-mono" + name = "FlatLaf JetBrains Mono Fonts Pack" +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/java/com/formdev/flatlaf/fonts/jetbrains_mono/FlatJetBrainsMonoFont.java b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/java/com/formdev/flatlaf/fonts/jetbrains_mono/FlatJetBrainsMonoFont.java new file mode 100644 index 000000000..94a6ba1f7 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/java/com/formdev/flatlaf/fonts/jetbrains_mono/FlatJetBrainsMonoFont.java @@ -0,0 +1,105 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.jetbrains_mono; + +import java.awt.Font; +import java.awt.FontFormatException; +import java.awt.GraphicsEnvironment; +import java.io.IOException; +import java.io.InputStream; + +/** + * The JetBrains Mono font family. + *

+ * Font home page: https://www.jetbrains.com/mono
+ * GitHub project: https://github.com/JetBrains/JetBrainsMono + *

+ * To install the font, invoke following once (e.g. in your {@code main()} method; on AWT thread): + *

{@code
+ * FlatJetBrainsMonoFont.install();
+ * }
+ *

+ * Use as default monospaced font: + *

{@code
+ * FlatLaf.setPreferredMonospacedFontFamily( FlatJetBrainsMonoFont.FAMILY );
+ * }
+ *

+ * Create fonts: + *

{@code
+ * new Font( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 12 );
+ * new Font( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 12 );
+ * new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 12 );
+ * new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
+ * }
+ * + * @author Karl Tauber + */ +public class FlatJetBrainsMonoFont +{ + /** + * Family name for basic styles (regular, italic and bold). + *

+ * Usage: + *

{@code
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 12 );
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 12 );
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 12 );
+	 * new Font( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
+	 * }
+ */ + public static final String FAMILY = "JetBrains Mono"; + + /** + * Use for {@link #installStyle(String)} to install single font styles. + */ + public static final String + // basic styles + STYLE_REGULAR = "JetBrainsMono-Regular.ttf", + STYLE_ITALIC = "JetBrainsMono-Italic.ttf", + STYLE_BOLD = "JetBrainsMono-Bold.ttf", + STYLE_BOLD_ITALIC = "JetBrainsMono-BoldItalic.ttf"; + + + private FlatJetBrainsMonoFont() {} + + /** + * Creates and registers the fonts for all styles. + */ + public static void install() { + installStyle( STYLE_REGULAR ); + installStyle( STYLE_ITALIC ); + installStyle( STYLE_BOLD ); + installStyle( STYLE_BOLD_ITALIC ); + } + + /** + * Creates and registers the font for the given style. + * See {@code STYLE_} constants. + */ + public static boolean installStyle( String name ) { + try( InputStream in = FlatJetBrainsMonoFont.class.getResourceAsStream( name ) ) { + Font font = Font.createFont( Font.TRUETYPE_FONT, in ); + return GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont( font ); + } catch( FontFormatException ex ) { + ex.printStackTrace(); + return false; + } catch( IOException ex ) { + ex.printStackTrace(); + return false; + } + } +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/module-info/module-info.java b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/module-info/module-info.java new file mode 100644 index 000000000..b3984c690 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/module-info/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Karl Tauber + */ +module com.formdev.flatlaf.fonts.jetbrains_mono { + requires java.desktop; + + exports com.formdev.flatlaf.fonts.jetbrains_mono; + + opens com.formdev.flatlaf.fonts.jetbrains_mono; +} diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf new file mode 100644 index 000000000..0a9280916 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 000000000..d051920c1 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf new file mode 100644 index 000000000..e54a46ee9 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf new file mode 100644 index 000000000..8da8aa405 Binary files /dev/null and b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf differ diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt new file mode 100644 index 000000000..821a3dac2 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/main/resources/com/formdev/flatlaf/fonts/jetbrains_mono/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/test/java/com/formdev/flatlaf/fonts/jetbrains_mono/TestFlatJetBrainsMonoFont.java b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/test/java/com/formdev/flatlaf/fonts/jetbrains_mono/TestFlatJetBrainsMonoFont.java new file mode 100644 index 000000000..3eb795bd0 --- /dev/null +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/src/test/java/com/formdev/flatlaf/fonts/jetbrains_mono/TestFlatJetBrainsMonoFont.java @@ -0,0 +1,44 @@ +/* + * Copyright 2022 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.fonts.jetbrains_mono; + +import java.awt.Font; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author Karl Tauber + */ +class TestFlatJetBrainsMonoFont +{ + @Test + void testFont() { + FlatJetBrainsMonoFont.install(); + + testFont( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, 13 ); + testFont( FlatJetBrainsMonoFont.FAMILY, Font.ITALIC, 13 ); + testFont( FlatJetBrainsMonoFont.FAMILY, Font.BOLD, 13 ); + testFont( FlatJetBrainsMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 13 ); + } + + private void testFont( String family, int style, int size ) { + Font actual = new Font( family, style, size ); + assertEquals( family, actual.getFamily() ); + assertEquals( style, actual.getStyle() ); + assertEquals( size, actual.getSize() ); + } +} diff --git a/flatlaf-testing/build.gradle.kts b/flatlaf-testing/build.gradle.kts index f72ccbb9d..93f420abe 100644 --- a/flatlaf-testing/build.gradle.kts +++ b/flatlaf-testing/build.gradle.kts @@ -24,6 +24,8 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( project( ":flatlaf-extras" ) ) + implementation( project( ":flatlaf-fonts-inter" ) ) + implementation( project( ":flatlaf-fonts-jetbrains-mono" ) ) implementation( project( ":flatlaf-swingx" ) ) implementation( project( ":flatlaf-jide-oss" ) ) implementation( project( ":flatlaf-intellij-themes" ) ) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java index 75c2b254d..479136453 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatFontsTest.java @@ -23,6 +23,8 @@ import java.util.Map; import java.util.TreeMap; import javax.swing.*; +import com.formdev.flatlaf.fonts.inter.FlatInterFont; +import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont; import com.formdev.flatlaf.util.UIScale; import net.miginfocom.swing.*; @@ -34,6 +36,9 @@ public class FlatFontsTest { public static void main( String[] args ) { SwingUtilities.invokeLater( () -> { + FlatInterFont.install(); + FlatJetBrainsMonoFont.install(); + FlatTestFrame frame = FlatTestFrame.create( args, "FlatFontsTest" ); frame.showFrame( FlatFontsTest::new ); } ); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java index 62e054cce..187ef6ed8 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java @@ -30,6 +30,8 @@ import javax.swing.text.StyleContext; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatSystemProperties; +import com.formdev.flatlaf.fonts.inter.FlatInterFont; +import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont; import com.formdev.flatlaf.util.Graphics2DProxy; import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.JavaCompatibility; @@ -45,8 +47,12 @@ public class FlatPaintingStringTest public static void main( String[] args ) { System.setProperty( FlatSystemProperties.UI_SCALE, "1x" ); System.setProperty( "sun.java2d.uiScale", "1x" ); + System.setProperty( "FlatLaf.debug.HiDPIUtils.useDebugScaleFactor", "true" ); SwingUtilities.invokeLater( () -> { + FlatInterFont.install(); + FlatJetBrainsMonoFont.install(); + FlatTestFrame frame = FlatTestFrame.create( args, "FlatPaintingStringTest" ); ToolTipManager.sharedInstance().setInitialDelay( 0 ); @@ -70,30 +76,32 @@ public static void main( String[] args ) { String[] families = { // regular "Arial", "Cantarell", "DejaVu Sans", - "Dialog", "Helvetica Neue", "Inter", "Liberation Sans", "Noto Sans", "Open Sans", "Roboto", + "Dialog", "Helvetica Neue", "Liberation Sans", "Noto Sans", "Open Sans", "Roboto", "SansSerif", "Segoe UI", "Tahoma", "Ubuntu", "Verdana", ".SF NS Text", + FlatInterFont.FAMILY, // light, semibold "Segoe UI Light", "Segoe UI Semibold", "HelveticaNeue-Thin", "HelveticaNeue-Medium", "Lato Light", "Ubuntu Light", "Cantarell Light", "Lato Semibold", "Ubuntu Medium", "Montserrat SemiBold", + FlatInterFont.FAMILY_LIGHT, FlatInterFont.FAMILY_SEMIBOLD, // monospaced "Monospaced", "Consolas", "Courier New", "Menlo", "Liberation Mono", "Ubuntu Mono", + FlatJetBrainsMonoFont.FAMILY, }; Arrays.sort( families, String.CASE_INSENSITIVE_ORDER ); DefaultComboBoxModel model = new DefaultComboBoxModel<>(); - model.addElement( currentFamily ); for( String family : families ) { - if( !family.equals( currentFamily ) && Arrays.binarySearch( availableFontFamilyNames, family ) >= 0 ) + if( Arrays.binarySearch( availableFontFamilyNames, family ) >= 0 ) model.addElement( family ); } fontField.setModel( model ); fontField.setSelectedItem( currentFamily ); updateFontMetricsLabel(); - add( new JLabel() ); + add( new JLabel(), "newLine" ); add( new JLabel( "none" ) ); add( new JLabel( "flatlaf" ) ); add( new JLabel() ); @@ -120,9 +128,8 @@ public static void main( String[] args ) { YCorrectionFunction none = (g, scaleFactor) -> 0; YCorrectionFunction flatlaf = (g, scaleFactor) -> { - return SystemInfo.isJava_9_orLater - ? HiDPIUtils.computeTextYCorrection( g ) - : (scaleFactor > 1 ? -(0.625f * scaleFactor) : 0); + System.setProperty( "FlatLaf.debug.HiDPIUtils.debugScaleFactor", Float.toString( scaleFactor ) ); + return HiDPIUtils.computeTextYCorrection( g ); }; YCorrectionFunction ty = (g, scaleFactor) -> { // Based on translateY, which is the scaled Y coordinate translation of the graphics context. @@ -214,8 +221,8 @@ private void initComponents() { // columns "[fill]", // rows - "[top]unrel" + - "[top]")); + "[shrink 0,top]unrel" + + "[shrink 0,top]")); //======== panel1 ======== { diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.jfd index 2ee598028..b3bfd328e 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.jfd @@ -1,4 +1,4 @@ -JFDML JFormDesigner: "7.0.5.0.404" Java: "17.0.2" encoding: "UTF-8" +JFDML JFormDesigner: "8.0.0.0.194" Java: "17.0.2" encoding: "UTF-8" new FormModel { contentType: "form/swing" @@ -9,7 +9,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$layoutConstraints": "insets dialog,hidemode 3" "$columnConstraints": "[fill]" - "$rowConstraints": "[top]unrel[top]" + "$rowConstraints": "[shrink 0,top]unrel[shrink 0,top]" } ) { name: "this" "border": sfield com.jformdesigner.model.FormObject NULL_VALUE diff --git a/flatlaf-theme-editor/build.gradle.kts b/flatlaf-theme-editor/build.gradle.kts index f44136d08..676db2a37 100644 --- a/flatlaf-theme-editor/build.gradle.kts +++ b/flatlaf-theme-editor/build.gradle.kts @@ -22,6 +22,8 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( project( ":flatlaf-extras" ) ) + implementation( project( ":flatlaf-fonts-inter" ) ) + implementation( project( ":flatlaf-fonts-jetbrains-mono" ) ) implementation( "com.miglayout:miglayout-swing:5.3" ) implementation( "com.fifesoft:rsyntaxtextarea:3.1.4" ) @@ -32,6 +34,8 @@ tasks { jar { dependsOn( ":flatlaf-core:jar" ) dependsOn( ":flatlaf-extras:jar" ) + dependsOn( ":flatlaf-fonts-inter:jar" ) + dependsOn( ":flatlaf-fonts-jetbrains-mono:jar" ) manifest { attributes( "Main-Class" to "com.formdev.flatlaf.themeeditor.FlatLafThemeEditor" ) diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java index 4bc60aba9..199b32463 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java @@ -34,6 +34,7 @@ import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.UIManager; +import javax.swing.text.StyleContext; import org.fife.ui.autocomplete.AutoCompletion; import org.fife.ui.autocomplete.CompletionProvider; import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; @@ -48,6 +49,7 @@ import org.fife.ui.rtextarea.RTextArea; import org.fife.ui.rtextarea.RTextScrollPane; import org.fife.ui.rtextarea.SearchContext; +import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont; import com.formdev.flatlaf.util.UIScale; /** @@ -128,8 +130,7 @@ class FlatThemeEditorPane } void updateTheme() { - Font defaultFont = RTextArea.getDefaultFont(); - Font font = defaultFont.deriveFont( (float) UIManager.getFont( "defaultFont" ).getSize() ); + Font font = createEditorFont( 0 ); textArea.setFont( font ); textArea.setBackground( UIManager.getColor( "FlatThemeEditorPane.background" ) ); @@ -161,14 +162,28 @@ void updateTheme() { } void updateFontSize( int sizeIncr ) { - Font defaultFont = RTextArea.getDefaultFont(); - Font font = defaultFont.deriveFont( (float) UIManager.getFont( "defaultFont" ).getSize() + sizeIncr ); + Font font = createEditorFont( sizeIncr ); textArea.setFont( font ); textArea.setSyntaxScheme( new FlatSyntaxScheme( font ) ); scrollPane.getGutter().setLineNumberFont( font ); } + private static Font createEditorFont( int sizeIncr ) { + int size = UIManager.getFont( "defaultFont" ).getSize() + sizeIncr; + StyleContext sc = StyleContext.getDefaultStyleContext(); + Font font = sc.getFont( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, size ); + if( isFallbackFont( font ) ) { + Font defaultFont = RTextArea.getDefaultFont(); + font = defaultFont.deriveFont( (float) size ); + } + return font; + } + + private static boolean isFallbackFont( Font font ) { + return Font.DIALOG.equalsIgnoreCase( font.getFamily() ); + } + void selected() { if( findReplaceVisible ) showFindReplaceBar( false ); diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java index 8ab22dbd2..a0bcb100e 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java @@ -63,6 +63,8 @@ import com.formdev.flatlaf.extras.FlatSVGUtils; import com.formdev.flatlaf.extras.FlatUIDefaultsInspector; import com.formdev.flatlaf.extras.components.*; +import com.formdev.flatlaf.fonts.inter.FlatInterFont; +import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont; import com.formdev.flatlaf.icons.FlatClearIcon; import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.StringUtils; @@ -105,6 +107,10 @@ static void main( String[] args ) { System.setProperty( "user.language", "en" ); SwingUtilities.invokeLater( () -> { + if( SystemInfo.isJava_11_orLater ) + FlatInterFont.install(); + FlatJetBrainsMonoFont.install(); + FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.themeeditor" ); try { diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ff4adda0..0e29a1651 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,6 +25,9 @@ include( "flatlaf-demo" ) include( "flatlaf-testing" ) include( "flatlaf-theme-editor" ) +includeProject( "flatlaf-fonts-inter", "flatlaf-fonts/flatlaf-fonts-inter" ) +includeProject( "flatlaf-fonts-jetbrains-mono", "flatlaf-fonts/flatlaf-fonts-jetbrains-mono" ) + includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" ) includeProject( "flatlaf-natives-linux", "flatlaf-natives/flatlaf-natives-linux" ) includeProject( "flatlaf-natives-jna", "flatlaf-natives/flatlaf-natives-jna" )