Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git

Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd

1 files changed, 11 insertions, 0 deletions

diff --git a/platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java b/platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java
index b7ec8556f3d9..67ca238ce077 100644
--- a/platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java
+++ b/platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java
@@ -17,6 +17,7 @@ package com.intellij.ui;
 
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -30,8 +31,15 @@ public abstract class ColoredListCellRenderer<T> extends SimpleColoredComponent
   protected boolean mySelected;
   protected Color myForeground;
   protected Color mySelectionForeground;
+  @Nullable
+  private final JComboBox myComboBox;
 
   public ColoredListCellRenderer() {
+    this(null);
+  }
+
+  public ColoredListCellRenderer(@Nullable JComboBox comboBox) {
+    myComboBox = comboBox;
     setFocusBorderAroundIcon(true);
     getIpad().left = UIUtil.getListCellHPadding();
     getIpad().right = UIUtil.getListCellHPadding();
@@ -40,6 +48,9 @@ public abstract class ColoredListCellRenderer<T> extends SimpleColoredComponent
   public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean hasFocus) {
     clear();
 
+    if (myComboBox != null) {
+      setEnabled(myComboBox.isEnabled());
+    }
     setFont(list.getFont());
     mySelected = selected;
     myForeground = list.getForeground();