From 871ed5a49226db466f1c1626d05d4360f5d18e70 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Fri, 6 Jan 2012 14:54:46 +0100 Subject: [PATCH] get system colors --- .../openapi/actionSystem/ex/ComboBoxAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java index 72bf6f0b8c41..9c9694eb1e82 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java @@ -22,7 +22,7 @@ import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.IdeFocusManager; -import com.intellij.ui.Gray; +import com.intellij.ui.ColorUtil; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.ui.UIUtil; @@ -300,16 +300,16 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent final int w = getWidth(); final int h = getHeight(); if (getModel().isArmed() && getModel().isPressed()) { - g2.setPaint(new GradientPaint(0,0, new Gray(220, 180), 0, h, new Gray(180, 180))); + g2.setPaint(new GradientPaint(0,0, UIUtil.getControlColor(), 0, h, ColorUtil.shift(UIUtil.getControlColor(), 0.8))); } else { - g2.setPaint(new GradientPaint(0,0, new Gray(250, 180), 0, h, new Gray(220, 180))); + g2.setPaint(new GradientPaint(0,0, ColorUtil.shift(UIUtil.getControlColor(), 1.1), 0, h, ColorUtil.shift(UIUtil.getControlColor(), 0.9))); } g2.fillRect(2, 0, w-2, h); if (!myMouseInside) { - g2.setPaint(new GradientPaint(0,0, Gray._180, 0, h, Gray._150)); + g2.setPaint(new GradientPaint(0,0, UIUtil.getBorderColor(), 0, h, UIUtil.getBorderColor().darker())); //g2.setColor(UIUtil.getBorderColor()); } else { - g2.setColor(UIUtil.getBorderColor().darker()); + g2.setPaint(new GradientPaint(0, 0, UIUtil.getBorderColor().darker(), 0, h, UIUtil.getBorderColor().darker().darker())); } g2.drawRect(2,0, w-3, h-1); final Icon icon = getIcon();