support specifying custom scale factor in system property `flatlaf.ui…

…Scale` also for Java 9 and later
JFormDesigner · Mar 31, 2020 · 9429ba7 · 9429ba7
1 parent af89dd1
commit 9429ba7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ FlatLaf Change Log
 - Support changing default font used for all components with automatic scaling
   UI if using larger font. Use `UIManager.put( "defaultFont", myFont );`
 - No longer use system property `sun.java2d.uiScale`. (Java 8 only)
+- Support specifying custom scale factor in system property `flatlaf.uiScale`
+  also for Java 9 and later.
 - Demo: Support using own FlatLaf themes (`.properties` files) that are located
   in working directory of Demo application. Shown in the "Themes" list under
   category "Current Directory".

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
@@ -204,9 +204,6 @@ private static boolean isUserScalingEnabled() {
 	 * to the given font.
 	 */
 	public static FontUIResource applyCustomScaleFactor( FontUIResource font ) {
-		if( UIScale.isSystemScalingEnabled() )
-			return font;
-
 		String uiScale = System.getProperty( "flatlaf.uiScale" );
 		float scaleFactor = parseScaleFactor( uiScale );
 		if( scaleFactor <= 0 )