diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java index 8a15c8d1..4264dfec 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java @@ -121,7 +121,7 @@ public class FlatUIUtils } public static Font nonUIResource( Font font ) { - return (font instanceof UIResource) ? new Font( font.getName(), font.getStyle(), font.getSize() ) : font; + return (font instanceof UIResource) ? font.deriveFont( font.getStyle() ) : font; } public static int minimumWidth( JComponent c, int minimumWidth ) { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java index d0bb15b8..10d34ff5 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java @@ -197,7 +197,7 @@ public class UIScale return font; int newFontSize = Math.round( (font.getSize() / fontScaleFactor) * scaleFactor ); - return new FontUIResource( font.getFamily(), font.getStyle(), newFontSize ); + return new FontUIResource( font.deriveFont( (float) newFontSize ) ); } /** @@ -205,7 +205,7 @@ public class UIScale */ public static FontUIResource scaleFont( FontUIResource font, float scaleFactor ) { int newFontSize = Math.round( font.getSize() * scaleFactor ); - return new FontUIResource( font.getFamily(), font.getStyle(), newFontSize ); + return new FontUIResource( font.deriveFont( (float) newFontSize ) ); } /**