angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 22:47:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fonts: support lazy font file loading (extends PRs #545 and #614)

Browse Source
This commit is contained in:
Karl Tauber
2022-11-21 11:51:27 +01:00
parent 6afc747790
commit d491847754
25 changed files with 525 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
View File

@@ -34,7 +34,6 @@ import javax.swing.JPanel;
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;
@@ -50,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.FontUtils;
import com.formdev.flatlaf.util.UIScale;
/**
@@ -171,8 +171,7 @@ class FlatThemeEditorPane
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 );
Font font = FontUtils.getCompositeFont( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, size );
if( isFallbackFont( font ) ) {
Font defaultFont = RTextArea.getDefaultFont();
font = defaultFont.deriveFont( (float) size );

7
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java
View File

@@ -108,10 +108,9 @@ class FlatThemeFileEditor
System.setProperty( "user.language", "en" );
SwingUtilities.invokeLater( () -> {
if( SystemInfo.isJava_11_orLater )
FlatInterFont.install();
FlatJetBrainsMonoFont.install();
FlatRobotoFont.install();
FlatInterFont.installLazy();
FlatJetBrainsMonoFont.installLazy();
FlatRobotoFont.installLazy();
FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.themeeditor" );