From 735c287e3f25f6317e5754088a35673d241cd9ce Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Fri, 16 Jun 2017 00:27:08 +0200 Subject: [PATCH] macOS system menu: respect -Dapple.laf.useScreenMenuBar=true --- src/com/bulenkov/darcula/DarculaLaf.java | 4 ++++ src/com/bulenkov/darcula/darcula_mac.properties | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/bulenkov/darcula/DarculaLaf.java b/src/com/bulenkov/darcula/DarculaLaf.java index d65d8c5..f960ded 100755 --- a/src/com/bulenkov/darcula/DarculaLaf.java +++ b/src/com/bulenkov/darcula/DarculaLaf.java @@ -104,6 +104,10 @@ public final class DarculaLaf extends BasicLookAndFeel { defaults.put("OptionPane.questionIcon", new IconUIResource(IconLoader.getIcon("/com/bulenkov/darcula/icons/option_pane_question.png"))); defaults.put("OptionPane.warningIcon", new IconUIResource(IconLoader.getIcon("/com/bulenkov/darcula/icons/option_pane_warning.png"))); defaults.put("OptionPane.errorIcon", new IconUIResource(IconLoader.getIcon("/com/bulenkov/darcula/icons/option_pane_error.png"))); + if (SystemInfo.isMac && !"true".equalsIgnoreCase(System.getProperty("apple.laf.useScreenMenuBar", "false"))) { + defaults.put("MenuBarUI", "com.bulenkov.darcula.ui.DarculaMenuBarUI"); + defaults.put("MenuUI", "javax.swing.plaf.basic.BasicMenuUI"); + } return defaults; } catch (Exception ignore) { diff --git a/src/com/bulenkov/darcula/darcula_mac.properties b/src/com/bulenkov/darcula/darcula_mac.properties index 1120c42..a6cf550 100755 --- a/src/com/bulenkov/darcula/darcula_mac.properties +++ b/src/com/bulenkov/darcula/darcula_mac.properties @@ -18,8 +18,6 @@ darcula.selectionBackground=2F65CA #Menu.arrowIcon=AllIcons.Mac.Tree_white_right_arrow -MenuBarUI=com.bulenkov.darcula.ui.DarculaMenuBarUI -MenuUI=javax.swing.plaf.basic.BasicMenuUI MenuBar.border=com.bulenkov.darcula.ui.DarculaMenuBarBorder FileChooserUI=javax.swing.plaf.metal.MetalFileChooserUI \ No newline at end of file