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

Merge pull request #237 from ingokegel/macos_font

Browse Source 
JetBrains Runtime 11 has support for displaying the .AppleSystemUIFont font.
This commit is contained in:
Karl T
2021-01-14 13:22:16 +01:00
committed by GitHub
parent 15328b4fd7 647d72514b
commit 3c086a92e2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,8 +467,13 @@ public abstract class FlatLaf
} else if( SystemInfo.isMacOS ) { } else if( SystemInfo.isMacOS ) {
String fontName; String fontName;
if( SystemInfo.isMacOS_10_15_Catalina_orLater ) { if( SystemInfo.isMacOS_10_15_Catalina_orLater ) {
// use Helvetica Neue font if (SystemInfo.isJetBrainsJVM_11_orLater) {
fontName = "Helvetica Neue"; // See https://youtrack.jetbrains.com/issue/JBR-1915
fontName = ".AppleSystemUIFont";
} else {
// use Helvetica Neue font
fontName = "Helvetica Neue";
}
} else if( SystemInfo.isMacOS_10_11_ElCapitan_orLater ) { } else if( SystemInfo.isMacOS_10_11_ElCapitan_orLater ) {
// use San Francisco Text font // use San Francisco Text font
fontName = ".SF NS Text"; fontName = ".SF NS Text";