From bd5cf0fdf487640446d7819ebda6338d87dc5b82 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 17 Oct 2017 01:04:25 +0300
Subject: [PATCH] IDEA-159531 Comboboxes hide background picture

---
 .../openapi/actionSystem/ex/ComboBoxAction.java     | 13 ++++++++-----
 .../intellij/openapi/wm/impl/IdeBackgroundUtil.java |  1 +
 2 files changed, 9 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 bbe00a5fbb69..6ae57ddfd374 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
@@ -37,10 +37,7 @@ import com.intellij.ui.ColorUtil;
 import com.intellij.ui.Gray;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.UserActivityProviderComponent;
-import com.intellij.util.ui.GraphicsUtil;
-import com.intellij.util.ui.JBUI;
-import com.intellij.util.ui.MouseEventAdapter;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.util.ui.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -379,13 +376,19 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
       return SystemInfo.isMac && isSmallVariant() ? UIUtil.getLabelFont(UIUtil.FontSize.SMALL) : UIUtil.getLabelFont();
     }
 
+    @Override
+    protected Graphics getComponentGraphics(Graphics graphics) {
+      return JBSwingUtilities.runGlobalCGTransform(this, super.getComponentGraphics(graphics));
+    }
+
     @Override
     public void paint(Graphics g) {
       Dimension size = getSize();
 
       if (UIUtil.isUnderDefaultMacTheme() || UIUtil.isUnderWin10LookAndFeel()) {
         super.paint(g);
-      } else {
+      }
+      else {
         UISettings.setupAntialiasing(g);
         GraphicsUtil.setupRoundedBorderAntialiasing(g);
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeBackgroundUtil.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeBackgroundUtil.java
index 634e2f2def65..a65fd0160d1b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeBackgroundUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeBackgroundUtil.java
@@ -100,6 +100,7 @@ public class IdeBackgroundUtil {
            component instanceof JList ? "list" :
            component instanceof JTable ? "table" :
            component instanceof JViewport ? "viewport" :
+           component instanceof JButton ? "button" :
            component instanceof ActionToolbar ? "toolbar" :
            component instanceof EditorsSplitters ? "frame" :
            component instanceof EditorComponentImpl ? "editor" :