Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2019-07-30 13:04:30 -0400
committerMickael Istria2019-07-30 13:04:30 -0400
commit417b6047c1ee012024e9fe086d073afcbc9c3611 (patch)
tree5a25da7c35086af105bbe9bf44c10c5566da719b
parent0e6b3ac15a797e6cc5fbeb49f4e9b5db48d89cb9 (diff)
downloadeclipse.platform.team-417b6047c1ee012024e9fe086d073afcbc9c3611.tar.gz
eclipse.platform.team-417b6047c1ee012024e9fe086d073afcbc9c3611.tar.xz
eclipse.platform.team-417b6047c1ee012024e9fe086d073afcbc9c3611.zip
Bug 450320 - Compare viewer show Red/Green when swapping sideI20190730-1800
Better handle colors for addition/removal in mirror mode Change-Id: I88abd677de063a69fc0630ac765f22c9bcc0ed60 Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index b78404720..a58365d29 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -4528,9 +4528,15 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
}
if (showAdditionRemoval) {
if (diff.getPosition(LEFT_CONTRIBUTOR).getLength() == 0) {
+ if (getCompareConfiguration().isMirrored()) {
+ return additionPalette;
+ }
return deletionPalette;
}
if (diff.getPosition(RIGHT_CONTRIBUTOR).getLength() == 0) {
+ if (getCompareConfiguration().isMirrored()) {
+ return deletionPalette;
+ }
return additionPalette;
}
return editionPalette;

Back to the top