From 42f899cd35ba432051ff979d7a5e70ca7eb19395 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 14 Oct 2011 16:06:48 +0200
Subject: [PATCH] new UI for navbar

---
 .../src/general/navbarSeparatorActive.png     | Bin 0 -> 513 bytes
 .../src/general/navbarSeparatorPassive.png    | Bin 0 -> 407 bytes
 .../ide/navigationToolbar/NavBarItem.java     |  25 +++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 platform/icons/src/general/navbarSeparatorActive.png
 create mode 100644 platform/icons/src/general/navbarSeparatorPassive.png

diff --git a/platform/icons/src/general/navbarSeparatorActive.png b/platform/icons/src/general/navbarSeparatorActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..505d0c739032f493d89f2e2dac8b1f687476cd58
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000XB000&U1^@s67UX7Q0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzqe(<TRCwBAoIH7Q^P@+PYD`Q_bhx;<
zt}@^OObQAL^&A`=_pV>RzT)4%f1G#~1MxqQso%bR)3|x_=0d0#PQ?sNOibU+%*>SE
zym=G&@ZrN6TpHkl?Ck81w6(Q;f$pycYV!a8|35QM#ULOgB(y_TR<`TfwQK9XfB&w5
zS1||xJzUGr&wuFBrAxd1{P`n@S1}0a>FGHGLxuxr!&;zoSn(=mWMupU^svf@4<GFB
z-o4uo5@Ns?Oe`!c?}0(82lQ;v)2C1K{{H>T%YrWwKryPMq*QX_#*L-Gh<m`qKmx$4
z7#OSC_wL>6QC3zi5D*a9hf^^q*v_0eb4f%*WSz9M^dx3x=FeCa1A~j@)TvW<fTkS;
znpy}F!s!fPgzN>TmmgYMTEW0z{0$EwbcGKdJZS#-@uM9mC4zzvrw8A?d*|`^@#8X}
zi9wv4oHsDS9>)0j^QYX^t5-M6$;mYXJ+%>(&anm^D2D(&bQh>-y}Z193pRx?#Z15;
zx&n-?8|v!n@wgO%odNVv<BuOdlt3N=<rsXC1Q1{Vv!Sgb|34QW00000NkvXXu0mjf
DR{`xu

literal 0
HcmV?d00001

diff --git a/platform/icons/src/general/navbarSeparatorPassive.png b/platform/icons/src/general/navbarSeparatorPassive.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b3f14106cd5f892eb11e9a1001f7774bc1b9ea6
GIT binary patch
literal 407
zcmV;I0cie-P)<h;3K|Lk000e1NJLTq000XB000&U1^@s67UX7Q0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzIY~r8RCwBy)3Hm#KorOEOH^nF2mb*F
z?NG3EG@F7Bx`=3({uSaNU0M;5E~TLOAGo=wh>Hk1bV^2rf*^Eob1EnpL2ded@B*dW
z1$ywIZ}{EI-An3)VR&MUX`qCz$yh#)(8DG2nc*M^2HLfV3vFNzM^R+h5K}K=M~~#Y
zj$w4eJLMMY*v6DKJhI`QvW06smOVVO;gGU}2h2Ic=?2z1a=5~bGc1elfBY1%ic@&b
zupXyRS;j8*FzcMDZjd*6fHSQ5W`gAm(^a}JQMR#<CqE-7V|&q=pX1BptFz^&@quS-
z;MaN#>B@S<4=QOe?J)j$`My{5OYB=OsKHIjn$GssIt>lZQ{JJ8Tl|lQy(CE_DF2X8
z+@Okq?bb34>HdaqEF*T!UM_fy1-($5^#+Fm3;<t9U|ueqnL_{o002ovPDHLkV1jNw
BwO{}M

literal 0
HcmV?d00001

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java
index bee3a116a63b..7c6e26c6bf25 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java
@@ -17,9 +17,10 @@ package com.intellij.ide.navigationToolbar;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.ui.CaptionPanel;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.util.IconUtil;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.JBInsets;
@@ -33,6 +34,8 @@ import java.awt.geom.Path2D;
 * @author Konstantin Bulenkov
 */
 class NavBarItem extends SimpleColoredComponent implements Disposable {
+  private static Image SEPARATOR_ACTIVE = IconUtil.toImage(IconLoader.getIcon("/general/navbarSeparatorActive.png"));
+  private static Image SEPARATOR_PASSIVE = IconUtil.toImage(IconLoader.getIcon("/general/navbarSeparatorPassive.png"));
   private final String myText;
   private final SimpleTextAttributes myAttributes;
   private final int myIndex;
@@ -179,18 +182,20 @@ class NavBarItem extends SimpleColoredComponent implements Disposable {
         g.fill(path);
       }
     }
-    if (! isLastElement() && ((!isSelected() && !isNextSelected()) || !myPanel.hasFocus())) {
-      path = new Path2D.Double();
-      path.moveTo(0, 0);
-      path.lineTo(off, h / 2);                //   \
-      path.lineTo(0, h);                      //   /
-      g.setPaint(CaptionPanel.getBorderColor(!myPanel.isNodePopupShowing() || !myPanel.isInFloatingMode()));
-      g.draw(path);
+    if (! isLastElement() && ((!isSelected() && !isNextSelected()) || !myPanel.hasFocus())) {      
+      //path = new Path2D.Double();
+      //path.moveTo(0, 0);
+      //path.lineTo(off, h / 2);                //   \
+      //path.lineTo(0, h);                      //   /
+      //g.setPaint(CaptionPanel.getBorderColor(!myPanel.isNodePopupShowing() || !myPanel.isInFloatingMode()));
+      Image img = !myPanel.isNodePopupShowing() || !myPanel.isInFloatingMode() ? SEPARATOR_ACTIVE : SEPARATOR_PASSIVE;
+      g.drawImage(img, null, null);
+      //g.draw(path);
     }
   }
   
   private static int getDecorationOffset() {
-    return 7;
+    return 11;
   }
   
   private static int getFirstElementLeftOffset() {
@@ -209,7 +214,7 @@ class NavBarItem extends SimpleColoredComponent implements Disposable {
   public Dimension getPreferredSize() {
     final Dimension size = super.getPreferredSize();
     if (! isPopupElement && NavBarPanel.isDecorated()) {
-      size.width += 7 + myPadding.width() + (isFirstElement() ? getFirstElementLeftOffset() : 0);
+      size.width += getDecorationOffset() + myPadding.width() + (isFirstElement() ? getFirstElementLeftOffset() : 0);
       size.height += myPadding.height();
     }
     return size;