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

macOS: use native screen menu bar if system property apple.laf.useScreenMenuBar is true

Browse Source
This commit is contained in:
Karl Tauber
2019-10-08 23:41:51 +02:00
parent 9216997bba
commit 49a574a8d7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,6 +1,12 @@
FlatLaf Change Log FlatLaf Change Log
================== ==================
## Unreleased
- macOS: Use native screen menu bar if system property
`apple.laf.useScreenMenuBar` is `true`.
## 0.11 ## 0.11
- Changed Maven groupId to `com.formdev` and artifactId to `flatlaf`. - Changed Maven groupId to `com.formdev` and artifactId to `flatlaf`.

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

@@ -157,9 +157,17 @@ public abstract class FlatLaf
defaults.put( "Spinner.disabledBackground", control ); defaults.put( "Spinner.disabledBackground", control );
defaults.put( "Spinner.disabledForeground", control ); defaults.put( "Spinner.disabledForeground", control );
// remember MenuBarUI from Mac Aqua LaF if Mac screen menubar is enabled
boolean useScreenMenuBar = SystemInfo.IS_MAC && "true".equals( System.getProperty( "apple.laf.useScreenMenuBar" ) );
Object aquaMenuBarUI = useScreenMenuBar ? defaults.get( "MenuBarUI" ) : null;
initFonts( defaults ); initFonts( defaults );
loadDefaultsFromProperties( defaults ); loadDefaultsFromProperties( defaults );
// use Aqua MenuBarUI if Mac screen menubar is enabled
if( useScreenMenuBar )
defaults.put( "MenuBarUI", aquaMenuBarUI );
return defaults; return defaults;
} }