MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] merge commits and non-picked commits use the same color

Browse Source
This commit is contained in:
Julia Beliaeva
2015-07-16 19:39:14 +03:00
parent c33edbdca7
commit 980342c38a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java
+1 -1
View File
@@ -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;
plugins/git4idea/src/git4idea/branch/DeepComparator.java
+2 -1
View File
@@ -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);