From 0585365e2459c704c2e85b06d6209e94ed91db37 Mon Sep 17 00:00:00 2001 From: Elena Shaverdova Date: Fri, 27 Dec 2019 16:15:06 +0100 Subject: [PATCH] Make progress' text2 text grey according to guide GitOrigin-RevId: 912f95ec95d8138e0ee421eebd804d110f8ceff2 --- .../com/intellij/openapi/ui/panel/ProgressPanelBuilder.java | 4 ++-- .../com/intellij/openapi/progress/util/ProgressDialog.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/ui/panel/ProgressPanelBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/panel/ProgressPanelBuilder.java index 6f7da2ac3c81..472fd4533d68 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/panel/ProgressPanelBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/panel/ProgressPanelBuilder.java @@ -16,7 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; public class ProgressPanelBuilder implements GridBagPanelBuilder, PanelBuilder { - private static final Color SEPARATOR_COLOR = new JBColor(Gray.xC9, Gray.x55); + private static final Color SEPARATOR_COLOR = JBUI.CurrentTheme.CustomFrameDecorations.separatorForeground(); private final JProgressBar myProgressBar; private String initialLabelText; @@ -199,7 +199,7 @@ public class ProgressPanelBuilder implements GridBagPanelBuilder, PanelBuilder { label = new JLabel(StringUtil.isNotEmpty(initialLabelText) ? initialLabelText : ""); comment = new JLabel(myCommentText); - comment.setForeground(Gray.x78); + comment.setForeground(UIUtil.getContextHelpForeground()); if (SystemInfo.isMac) { Font font = comment.getFont(); float size = font.getSize2D(); diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java index 14203508c255..b5e6d833141d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java @@ -112,6 +112,7 @@ class ProgressDialog implements Disposable { if (SystemInfo.isMac) { UIUtil.applyStyle(UIUtil.ComponentStyle.SMALL, myText2Label); } + myText2Label.setForeground(UIUtil.getContextHelpForeground()); myInnerPanel.setPreferredSize(new Dimension(SystemInfo.isMac ? 350 : JBUIScale.scale(450), -1)); myCancelButton.addActionListener(__ -> doCancelAction());