Cache resolved fonts. Resolves #149

kordamp · Mar 11, 2022 · 071219d · 071219d
1 parent 615e8da
commit 071219d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java b/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java
@@ -21,7 +21,9 @@
 import org.kordamp.ikonli.AbstractIkonResolver;
 import org.kordamp.ikonli.IkonHandler;
 
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
 
@@ -32,14 +34,16 @@ public class IkonResolver extends AbstractIkonResolver {
     private static final IkonResolver INSTANCE;
     private static final Set<IkonHandler> HANDLERS = new LinkedHashSet<>();
     private static final Set<IkonHandler> CUSTOM_HANDLERS = new LinkedHashSet<>();
+    private static final Map<String, Font> FONTS = new LinkedHashMap<>();
 
     static {
         INSTANCE = new IkonResolver();
 
         ServiceLoader<IkonHandler> loader = resolveServiceLoader();
         for (IkonHandler handler : loader) {
             HANDLERS.add(handler);
-            handler.setFont(Font.loadFont(handler.getFontResource().toExternalForm(), 16));
+            String fontResource = handler.getFontResource().toExternalForm();
+            handler.setFont(FONTS.computeIfAbsent(fontResource, key -> Font.loadFont(key, 16)));
         }
     }