From 4ae699956b4da74a36f6a674b308bc242c90162c Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 11 Aug 2010 17:58:15 +0400 Subject: [PATCH] fix mac popups bg color [finally] --- .../src/com/intellij/ui/popup/AbstractPopup.java | 4 ---- .../src/com/intellij/ui/popup/PopupComponent.java | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 5bfb2e92403c..db179130e98b 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -1025,10 +1025,6 @@ public class AbstractPopup implements JBPopup { else { setBorder(border); } - - if (drawMacCorner && UIUtil.isUnderAquaLookAndFeel()) { - setBackground(new Color(UIUtil.getPanelBackgound().getRGB())); - } } public void paint(Graphics g) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java index 445c642a0e0a..94b4bbbdee29 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java @@ -17,7 +17,9 @@ package com.intellij.ui.popup; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.popup.util.PopupUtil; +import com.intellij.openapi.util.SystemInfo; import com.intellij.util.ReflectionUtil; +import com.intellij.util.ui.UIUtil; import javax.swing.*; import java.awt.*; @@ -133,6 +135,11 @@ public interface PopupComponent { public AwtPopupWrapper(Popup popup) { myPopup = popup; + + if (SystemInfo.isMac && UIUtil.isUnderAquaLookAndFeel()) { + final Component c = (Component)ReflectionUtil.getField(Popup.class, myPopup, Component.class, "component"); + c.setBackground(UIUtil.getPanelBackgound()); + } } public void hide(boolean dispose) { -- 2.32.0