From 45e05ea649fb834c7a7d76294502f2d3b6eaefa1 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 10 Oct 2016 20:23:15 +0300 Subject: [PATCH] [vcs-log] fix IAE in commit details in GTK: use gray_128 for committer and commit date Replace disabled button color, which is null for GTK, with gray_128 color as specified in IDEA-160683. Fixes IDEA-161650. --- .../impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java index ea0cd262efb5..44fe4e0e6b83 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java @@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer; import com.intellij.openapi.vcs.ui.FontUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ColorUtil; +import com.intellij.ui.JBColor; import com.intellij.ui.UI; import com.intellij.ui.components.JBPanel; import com.intellij.ui.components.JBScrollPane; @@ -301,7 +302,7 @@ class CommitPanel extends JBPanel { @NotNull private static String getCommitterText(@Nullable VcsUser committer, @NotNull String commitTimeText, int offset) { String alignment = "
" + StringUtil.repeat(" ", offset); - String gray = ColorUtil.toHex(UIManager.getColor("Button.disabledText")); + String gray = ColorUtil.toHex(JBColor.GRAY); String graySpan = "";