diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b055641..ecce5cce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ FlatLaf Change Log for editable comboboxes). - ComboBox: Support custom borders in combobox editors. (issue #102) - Ubuntu Linux: Fixed poorly rendered font. (issue #105) +- macOS Catalina: Use Helvetica Neue font. ## 0.35 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index 2f97c616..8984e838 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -377,7 +377,10 @@ public abstract class FlatLaf } else if( SystemInfo.IS_MAC ) { String fontName; - if( SystemInfo.IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER ) { + if( SystemInfo.IS_MAC_OS_10_15_CATALINA_OR_LATER ) { + // use Helvetica Neue font + fontName = "Helvetica Neue"; + } else if( SystemInfo.IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER ) { // use San Francisco Text font fontName = ".SF NS Text"; } else { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java index 0909fdb1..8ae25ce0 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java @@ -33,6 +33,7 @@ public class SystemInfo // OS versions public static final boolean IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER; + public static final boolean IS_MAC_OS_10_15_CATALINA_OR_LATER; // Java versions public static final boolean IS_JAVA_9_OR_LATER; @@ -53,6 +54,7 @@ public class SystemInfo // OS versions long osVersion = scanVersion( System.getProperty( "os.version" ) ); IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER = (IS_MAC && osVersion >= toVersion( 10, 11, 0, 0 )); + IS_MAC_OS_10_15_CATALINA_OR_LATER = (IS_MAC && osVersion >= toVersion( 10, 15, 0, 0 )); // Java versions long javaVersion = scanVersion( System.getProperty( "java.version" ) );