From dd603b4a8c4733e6d0ac68b4ba02fe9d4d20f034 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 17 Dec 2019 15:14:50 +0300 Subject: [PATCH] Support custom background for popup title GitOrigin-RevId: 6b46f47e59d47da0928fb681bb76693d9703e46d --- .../src/com/intellij/dvcs/ui/BranchActionGroupPopup.java | 1 + platform/util/ui/src/com/intellij/ui/CaptionPanel.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java index 92dc879bcf1d..6d4287376062 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java @@ -64,6 +64,7 @@ public class BranchActionGroupPopup extends FlatSpeedSearchPopup { @Nullable String dimensionKey) { super(title, createBranchSpeedSearchActionGroup(actions), SimpleDataContext.getProjectContext(project), preselectActionCondition, true); + getTitle().setBackground(JBColor.PanelBackground); myProject = project; DataManager.registerDataProvider(getList(), dataId -> POPUP_MODEL.is(dataId) ? getListModel() : null); myKey = dimensionKey; diff --git a/platform/util/ui/src/com/intellij/ui/CaptionPanel.java b/platform/util/ui/src/com/intellij/ui/CaptionPanel.java index 6e2be97b94de..938906fac338 100644 --- a/platform/util/ui/src/com/intellij/ui/CaptionPanel.java +++ b/platform/util/ui/src/com/intellij/ui/CaptionPanel.java @@ -24,6 +24,7 @@ public class CaptionPanel extends JPanel { public CaptionPanel() { setLayout(new BorderLayout()); + setBackground(null); } @Override @@ -31,8 +32,11 @@ public class CaptionPanel extends JPanel { super.paintComponent(g); Graphics2D g2d = (Graphics2D) g; - - g2d.setPaint(JBUI.CurrentTheme.Popup.headerBackground(myActive)); + Color background = getBackground(); + if (background == null) { + background = JBUI.CurrentTheme.Popup.headerBackground(myActive); + } + g2d.setColor(background); g2d.fillRect(0, 0, getWidth(), getHeight()); }