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

copy all font attributes in FlatUIUtils.nonUIResource() and when scaling fonts (issue #75)

Browse Source
This commit is contained in:
Karl Tauber
2020-03-12 11:22:43 +01:00
parent de718f847c
commit eb30f9d5bf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
View File

@@ -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 ) {

4
flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java
View File

@@ -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 ) );
}
/**