From 533f276ad40c5f4860b80ada92a10b48d7a36ebc Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Thu, 19 Jul 2012 20:03:32 +0400 Subject: [PATCH] patch from: Dmitry Malchikov --- .../intellij/ide/util/treeView/PresentableNodeDescriptor.java | 2 +- .../src/com/intellij/ui/treeStructure/SimpleNode.java | 3 ++- platform/util/src/com/intellij/util/ui/UIUtil.java | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java b/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java index 9146b24a3dce..d208b3f74ff5 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java @@ -167,7 +167,7 @@ public abstract class PresentableNodeDescriptor extends NodeDescriptor { } public Color getHighlightColor() { - return UIUtil.isUnderDarcula() ? UIUtil.getPanelBackground().brighter() : Gray._245; + return UIUtil.isUnderDarcula() ? UIUtil.getPanelBackground().brighter() : UIUtil.getTreeBackground().brighter(); } public static class ColoredFragment { diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java index 780680254082..9edbf16681c6 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vcs.FileStatus; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.ComparableObject; import com.intellij.util.ui.update.ComparableObjectCheck; import org.jetbrains.annotations.NotNull; @@ -97,7 +98,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co Icon oldClosedIcon = myClosedIcon; List oldFragments = new ArrayList(presentation.getColoredText()); - myColor = Color.black; + myColor = UIUtil.getTreeTextForeground(); updateFileStatus(); doUpdate(); diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index 8c92cdf0a8a3..631cb227fac3 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -644,6 +644,10 @@ public class UIUtil { return UIManager.getColor("Panel.background"); } + public static Color getTreeBackground() { + return UIManager.getColor("Tree.background"); + } + public static Color getTreeForeground() { return UIManager.getColor("Tree.foreground"); }