From a60107a93562618ea5dc247d1592826d6dfbc693 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 21 Jun 2012 03:21:05 +0200
Subject: [PATCH] fix menu and separators for darcula

---
 .../src/com/intellij/ide/ui/laf/IdeaDarkLaf.java          | 8 ++++++++
 .../openapi/actionSystem/impl/ActionToolbarImpl.java      | 2 +-
 .../src/com/intellij/ui/plaf/beg/BegMenuItemUI.java       | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkLaf.java
index 7d068fe7b409..c2b3639e1430 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkLaf.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkLaf.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.ide.ui.laf;
 
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.ColorUtil;
 
@@ -68,6 +70,12 @@ final class IdeaDarkLaf extends BasicLookAndFeel {
       final UIDefaults defaults = (UIDefaults)superMethod.invoke(base);
       LafManagerImpl.initInputMapDefaults(defaults);
       initIdeaDefaults(defaults);
+      if (SystemInfo.isMac) {
+        defaults.put("Menu.arrowIcon", AllIcons.Mac.Tree_white_right_arrow);
+        defaults.put("MenuItem.acceleratorForeground", new ColorUIResource(255, 255, 255));
+        defaults.put("Separator.foreground", new ColorUIResource(ColorUtil.fromHex("888888")));
+        defaults.put("PopupMenu.background", new ColorUIResource(ColorUtil.fromHex("444444")));
+      }
       return defaults;
     }
     catch (Exception ignore) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index a1e7d307321f..322d9506c5b6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -713,7 +713,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
 
     protected void paintComponent(final Graphics g) {
       final Insets insets = getInsets();
-      if (UIUtil.isUnderAquaLookAndFeel()) {
+      if (UIUtil.isUnderAquaBasedLookAndFeel()) {
         if (getParent() != null) {
           if (myOrientation == SwingConstants.HORIZONTAL) {
             UIUtil.drawDoubleSpaceDottedLine((Graphics2D)g, insets.top + 2, getParent().getSize().height - 2 - insets.top - insets.bottom, 3, Color.GRAY, false);
diff --git a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java
index bbe0575a9b7f..ce6699eea078 100644
--- a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java
+++ b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java
@@ -68,7 +68,7 @@ public class BegMenuItemUI extends BasicMenuItemUI {
   public BegMenuItemUI() {
     myMaxGutterIconWidth = 18;
 
-    if (UIUtil.isUnderAquaLookAndFeel() && myAquaSelectedBackgroundPainter == null) {
+    if (UIUtil.isUnderAquaBasedLookAndFeel() && myAquaSelectedBackgroundPainter == null) {
       myAquaSelectedBackgroundPainter = (Border) UIManager.get("MenuItem.selectedBackgroundPainter");
     }
   }
@@ -188,10 +188,10 @@ public class BegMenuItemUI extends BasicMenuItemUI {
         }
       }
     }
-    if (keyStrokeText != null && !keyStrokeText.equals("")){
+    if (keyStrokeText != null && !keyStrokeText.isEmpty()){
       g.setFont(acceleratorFont);
       if (buttonmodel.isEnabled()){
-        if (UIUtil.isUnderAquaLookAndFeel() && (buttonmodel.isArmed() || (comp instanceof JMenu) && buttonmodel.isSelected())) {
+        if (UIUtil.isUnderAquaBasedLookAndFeel() && (buttonmodel.isArmed() || (comp instanceof JMenu) && buttonmodel.isSelected())) {
           g.setColor(selectionForeground);
         }
         else {