MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Kalishev
2011-10-14 18:12:44 +04:00
parent 6e8e941eb1 42f899cd35
commit 1c1f27e775
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/icons/src/general/navbarSeparatorActive.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

platform/icons/src/general/navbarSeparatorPassive.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java
+15 -10
View File
@@ -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;