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

IDEA-189256 diff: do not use custom chevron icon for local changes

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-11-08 17:27:48 +03:00
parent 89a2a067a5
commit 6cf239004e
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java
+1 -4
View File
@@ -18,7 +18,6 @@ package com.intellij.diff.tools.simple;
import com.intellij.diff.fragments.DiffFragment;
import com.intellij.diff.fragments.LineFragment;
import com.intellij.diff.util.*;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.diff.impl.DiffUsageTriggerCollector;
import com.intellij.openapi.editor.Document;
@@ -311,15 +310,13 @@ public class SimpleDiffChange {
@Nullable
private GutterIconRenderer createApplyRenderer(@NotNull final Side side) {
String text;
Icon icon;
Icon icon = DiffUtil.getArrowIcon(side);
if (side == Side.LEFT && myViewer.isDiffForLocalChanges()) {
text = "Revert";
icon = AllIcons.Diff.Revert;
}
else {
text = "Accept";
icon = DiffUtil.getArrowIcon(side);
}
return createIconRenderer(side, text, icon, () -> {
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
-2
View File
@@ -28,7 +28,6 @@ import com.intellij.diff.tools.util.side.TwosideTextDiffViewer;
import com.intellij.diff.tools.util.text.TwosideTextDiffProvider;
import com.intellij.diff.util.*;
import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ReadAction;
@@ -604,7 +603,6 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer {
@Nullable
@Override
protected Icon getIcon(@NotNull Side side) {
if (myModifiedSide == Side.RIGHT && isDiffForLocalChanges()) return AllIcons.Diff.Revert;
return DiffUtil.getArrowIcon(myModifiedSide.other());
}