summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJerome Gaillard <jgaillard@google.com>2015-08-03 15:44:22 -0500
committerJerome Gaillard <jgaillard@google.com>2015-08-03 15:44:22 -0500
commit80623c288006815818c7aa1edac8d4312bf993a4 (patch)
tree3725b47a9929fceee037ee892ef3cce27358d9fc /android
parent9115474d6f79418f73d32e1dbccb131bf3ccbfa5 (diff)
downloadidea-80623c288006815818c7aa1edac8d4312bf993a4.tar.gz
Fix UI of configuration toolbar
On Mac, the background of the configuration toolbar in the theme editor was not the same as the background of the preview. Change-Id: Iadf983eda0a515ee00b7db95c6aab10571af6128
Diffstat (limited to 'android')
-rw-r--r--android/src/com/android/tools/idea/configurations/FlatComboAction.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/android/src/com/android/tools/idea/configurations/FlatComboAction.java b/android/src/com/android/tools/idea/configurations/FlatComboAction.java
index 7e407a68786..32d4f19c587 100644
--- a/android/src/com/android/tools/idea/configurations/FlatComboAction.java
+++ b/android/src/com/android/tools/idea/configurations/FlatComboAction.java
@@ -393,10 +393,7 @@ public abstract class FlatComboAction extends AnAction implements CustomComponen
final Dimension size = getSize();
{
final Graphics2D g2 = (Graphics2D)g;
- Color controlColor = UIUtil.getControlColor();
- if (UIUtil.isUnderIntelliJLaF()) {
- controlColor = getParent().getBackground();
- }
+ Color controlColor = getParent().getBackground();
g2.setColor(controlColor);
final int w = getWidth();
final int h = getHeight();