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

macOS Catalina: Use Helvetica Neue font

Browse Source
This commit is contained in:
Karl Tauber
2020-05-30 21:44:52 +02:00
parent 14ec6f6471
commit e0b0617ad2
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ FlatLaf Change Log
for editable comboboxes). for editable comboboxes).
- ComboBox: Support custom borders in combobox editors. (issue #102) - ComboBox: Support custom borders in combobox editors. (issue #102)
- Ubuntu Linux: Fixed poorly rendered font. (issue #105) - Ubuntu Linux: Fixed poorly rendered font. (issue #105)
- macOS Catalina: Use Helvetica Neue font.
## 0.35 ## 0.35

5
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -377,7 +377,10 @@ public abstract class FlatLaf
} else if( SystemInfo.IS_MAC ) { } else if( SystemInfo.IS_MAC ) {
String fontName; 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 // use San Francisco Text font
fontName = ".SF NS Text"; fontName = ".SF NS Text";
} else { } else {

2
flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
View File

@@ -33,6 +33,7 @@ public class SystemInfo
// OS versions // OS versions
public static final boolean IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER; 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 // Java versions
public static final boolean IS_JAVA_9_OR_LATER; public static final boolean IS_JAVA_9_OR_LATER;
@@ -53,6 +54,7 @@ public class SystemInfo
// OS versions // OS versions
long osVersion = scanVersion( System.getProperty( "os.version" ) ); 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_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 // Java versions
long javaVersion = scanVersion( System.getProperty( "java.version" ) ); long javaVersion = scanVersion( System.getProperty( "java.version" ) );