diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java | |
parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/ui/ColoredListCellRenderer.java | 11 |
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(); |