From 0e9b27684f95f4a0f27f5a2ec880044ffe36bb36 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 25 Apr 2012 17:45:32 +0200
Subject: [PATCH] opaque control

---
 .../ide/projectView/impl/ProjectViewTree.java     | 10 ++++++++--
 .../openapi/vcs/changes/ui/ChangesTreeList.java   | 15 +++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
index 14c4bacd85e9..cd9c6e5e8a0e 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
@@ -49,7 +49,6 @@ public abstract class ProjectViewTree extends DnDAwareTree {
     cellRenderer.setIconOpaque(false);
     setCellRenderer(cellRenderer);
     cellRenderer.setTransparentIconBackground(true);
-    setOpaque(false);
   }
 
   public abstract DefaultMutableTreeNode getSelectedNode();
@@ -73,7 +72,14 @@ public abstract class ProjectViewTree extends DnDAwareTree {
 
   @Override
   public boolean isFileColorsEnabled() {
-    return FileColorManagerImpl._isEnabled() && FileColorManagerImpl._isEnabledForProjectView();
+    final boolean enabled = FileColorManagerImpl._isEnabled() && FileColorManagerImpl._isEnabledForProjectView();
+    final boolean opaque = isOpaque();
+    if (enabled && opaque) {
+      setOpaque(false);
+    } else if (!enabled && !opaque) {
+      setOpaque(true);
+    }
+    return enabled;
   }
 
   @Nullable
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
index aca0badcd84e..2251ef3b626e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,9 +110,16 @@ public abstract class ChangesTreeList<T> extends JPanel {
 
       @Override
       public boolean isFileColorsEnabled() {
-        return Registry.is("file.colors.in.commit.dialog")
-          && FileColorManager.getInstance(project).isEnabled()
-          && FileColorManager.getInstance(project).isEnabledForProjectView();
+        final boolean enabled = Registry.is("file.colors.in.commit.dialog")
+                          && FileColorManager.getInstance(project).isEnabled()
+                          && FileColorManager.getInstance(project).isEnabledForProjectView();
+        final boolean opaque = isOpaque();
+        if (enabled && opaque) {
+          setOpaque(false);
+        } else if (!enabled && !opaque) {
+          setOpaque(true);
+        }
+        return enabled;
       }
 
       @Override