From 980342c38a514be95cf2b79c99d78ef67ab47b4c Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Fri, 3 Jul 2015 18:56:17 +0300 Subject: [PATCH] [vcs-log] merge commits and non-picked commits use the same color --- .../src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java | 2 +- plugins/git4idea/src/git4idea/branch/DeepComparator.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java index 7b403e88d885..72516d3753b3 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java @@ -27,7 +27,7 @@ import com.intellij.vcs.log.graph.impl.facade.PermanentGraphImpl; import org.jetbrains.annotations.NotNull; public class MergeCommitsHighlighter implements VcsLogHighlighter { - private static final JBColor MERGE_COMMIT_FOREGROUND = new JBColor(Gray._192, Gray._96); + public static final JBColor MERGE_COMMIT_FOREGROUND = new JBColor(Gray._128, Gray._96); @NotNull private final VcsLogUiProperties myUiProperties; @NotNull private final VcsLogDataHolder myDataHolder; diff --git a/plugins/git4idea/src/git4idea/branch/DeepComparator.java b/plugins/git4idea/src/git4idea/branch/DeepComparator.java index e60035439040..1e1b1fdd8caa 100644 --- a/plugins/git4idea/src/git4idea/branch/DeepComparator.java +++ b/plugins/git4idea/src/git4idea/branch/DeepComparator.java @@ -30,6 +30,7 @@ import com.intellij.ui.JBColor; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.*; import com.intellij.vcs.log.impl.HashImpl; +import com.intellij.vcs.log.ui.MergeCommitsHighlighter; import git4idea.GitBranch; import git4idea.commands.GitCommand; import git4idea.commands.GitLineHandler; @@ -217,7 +218,7 @@ public class DeepComparator implements Disposable { @NotNull @Override public VcsCommitStyle getStyle(int commitIndex, boolean isSelected) { - return VcsCommitStyleFactory.foreground(!myNonPickedCommits.contains(commitIndex) ? JBColor.GRAY : null); + return VcsCommitStyleFactory.foreground(!myNonPickedCommits.contains(commitIndex) ? MergeCommitsHighlighter.MERGE_COMMIT_FOREGROUND : null); } }; myUi.addHighlighter(myHighlighter);