From 453fa48563aa5232c3499401f842e6e1e4aef9cc Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 22 Oct 2012 01:50:41 +0200 Subject: [PATCH] make navbar brighter on mac for new icons --- .../intellij/ide/navigationToolbar/NavBarBorder.java | 11 ++++++----- .../ide/navigationToolbar/ui/AbstractNavBarUI.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarBorder.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarBorder.java index 82921462be8b..727bda96096c 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarBorder.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarBorder.java @@ -16,6 +16,7 @@ package com.intellij.ide.navigationToolbar; import com.intellij.ide.ui.UISettings; +import com.intellij.ui.Gray; import javax.swing.border.Border; import java.awt.*; @@ -36,11 +37,11 @@ class NavBarBorder implements Border { if (!myDocked) return; if (UISettings.getInstance().SHOW_MAIN_TOOLBAR) { - g.setColor(new Color(255, 255, 255, 120)); - g.drawLine(x, y, x + width, y); + //g.setColor(Gray._180); + //g.drawLine(x, y, x + width, y); - g.setColor(new Color(0, 0, 0, 50)); - g.drawLine(x, y + 1, x + width, y + 1); + g.setColor(Gray._0.withAlpha(50)); + g.drawLine(x, y, x + width, y); } } @@ -54,7 +55,7 @@ class NavBarBorder implements Border { return new Insets(0, 0, 0, 4); } - return new Insets(2, 0, 0, 4); + return new Insets(1, 0, 0, 4); } return new Insets(1, 0, 1, 4); diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AbstractNavBarUI.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AbstractNavBarUI.java index 6733e1c17c00..fd3c76100bb6 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AbstractNavBarUI.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AbstractNavBarUI.java @@ -297,7 +297,7 @@ public abstract class AbstractNavBarUI implements NavBarUI { @Override public void doPaintNavBarPanel(Graphics2D g, Rectangle r, boolean mainToolbarVisible, boolean undocked) { g.setColor(getBackgroundColor()); - if (mainToolbarVisible) { + if (!UIUtil.isUnderAquaLookAndFeel() && mainToolbarVisible) { g.fillRect(0, 0, r.width, r.height); } }