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

UIScale: added system property "flatlaf.uiScale.enabled" (replaces "hidpi" property) to disable user scaling mode

Browse Source
This commit is contained in:
Karl Tauber
2020-08-02 14:08:18 +02:00
parent 4eb4ddf5d8
commit 30747b7776
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
View File

@@ -39,6 +39,14 @@ public interface FlatSystemProperties
*/ */
String UI_SCALE = "flatlaf.uiScale"; String UI_SCALE = "flatlaf.uiScale";
/**
* Specifies whether user scaling mode is enabled.
* <p>
* <strong>Allowed Values</strong> {@code false} and {@code true}<br>
* <strong>Default</strong> {@code true}
*/
String UI_SCALE_ENABLED = "flatlaf.uiScale.enabled";
/** /**
* Specifies whether Ubuntu font should be used on Ubuntu Linux. * Specifies whether Ubuntu font should be used on Ubuntu Linux.
* By default, if not running in a JetBrains Runtime, the Liberation Sans font * By default, if not running in a JetBrains Runtime, the Liberation Sans font

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

@@ -195,8 +195,7 @@ public class UIScale
} }
private static boolean isUserScalingEnabled() { private static boolean isUserScalingEnabled() {
// same as in IntelliJ IDEA return FlatSystemProperties.getBoolean( FlatSystemProperties.UI_SCALE_ENABLED, true );
return FlatSystemProperties.getBoolean( "hidpi", true );
} }
/** /**
@@ -204,6 +203,9 @@ public class UIScale
* to the given font. * to the given font.
*/ */
public static FontUIResource applyCustomScaleFactor( FontUIResource font ) { public static FontUIResource applyCustomScaleFactor( FontUIResource font ) {
if( !isUserScalingEnabled() )
return font;
String uiScale = System.getProperty( FlatSystemProperties.UI_SCALE ); String uiScale = System.getProperty( FlatSystemProperties.UI_SCALE );
float scaleFactor = parseScaleFactor( uiScale ); float scaleFactor = parseScaleFactor( uiScale );
if( scaleFactor <= 0 ) if( scaleFactor <= 0 )