Skip to content

[Compare] Apply editor selection colors to merge viewer panes #2657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobiasmelcher wants to merge 2 commits into
base: master
Choose a base branch
from
+74 −0
Open

[Compare] Apply editor selection colors to merge viewer panes #2657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f72e421
[Compare] Apply editor selection colors to merge viewer panes
tobias-melcher May 11, 2026
b48a514
Extract helper methods for null-safe widget access and use static
tobias-melcher May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions ...s/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
*******************************************************************************/
package org.eclipse.compare.contentmergeviewer;

import static org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_COLOR;
import static org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR;
import static org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_COLOR;
import static org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR;

import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
Expand Down Expand Up @@ -1870,6 +1875,24 @@ private void updateColors(Display display) {
fRight.setForegroundColor(fgColor);
}

Color selectionBackgroundColor = getSelectionBackgroundColor();
Color selectionForegroundColor = getSelectionForegroundColor();
StyledText ancestorSourceViewerWidget = getAncestorSourceViewerWidget();
if (ancestorSourceViewerWidget != null) {
ancestorSourceViewerWidget.setSelectionBackground(selectionBackgroundColor);
ancestorSourceViewerWidget.setSelectionForeground(selectionForegroundColor);
}
StyledText leftSourceViewerWidget = getLeftSourceViewerWidget();
if (leftSourceViewerWidget != null) {
leftSourceViewerWidget.setSelectionBackground(selectionBackgroundColor);
leftSourceViewerWidget.setSelectionForeground(selectionForegroundColor);
}
StyledText rightSourceViewerWidget = getRightSourceViewerWidget();
if (rightSourceViewerWidget != null) {
rightSourceViewerWidget.setSelectionBackground(selectionBackgroundColor);
rightSourceViewerWidget.setSelectionForeground(selectionForegroundColor);
}

ColorRegistry registry= JFaceResources.getColorRegistry();

RGB bg= getBackground(display);
Expand All @@ -1890,6 +1913,51 @@ private void updateColors(Display display) {
updatePresentation();
}

private StyledText getAncestorSourceViewerWidget() {
if (fAncestor == null) {
return null;
}
SourceViewer sourceViewer = fAncestor.getSourceViewer();
if (sourceViewer == null) {
return null;
}
return sourceViewer.getTextWidget();
}

private StyledText getLeftSourceViewerWidget() {
if (fLeft == null) {
return null;
}
SourceViewer sourceViewer = fLeft.getSourceViewer();
if (sourceViewer == null) {
return null;
}
return sourceViewer.getTextWidget();
}

private StyledText getRightSourceViewerWidget() {
if (fRight == null) {
return null;
}
SourceViewer sourceViewer = fRight.getSourceViewer();
if (sourceViewer == null) {
return null;
}
return sourceViewer.getTextWidget();
}

private Color getSelectionBackgroundColor() {
RGB rgb = fPreferenceStore.getBoolean(EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR) ? null
: PreferenceConverter.getColor(fPreferenceStore, EDITOR_SELECTION_BACKGROUND_COLOR);
return getColor(rgb);
}

private Color getSelectionForegroundColor() {
RGB rgb = fPreferenceStore.getBoolean(EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR) ? null
: PreferenceConverter.getColor(fPreferenceStore, EDITOR_SELECTION_FOREGROUND_COLOR);
return getColor(rgb);
}

private void updatePresentation() {
refreshBirdsEyeView();
invalidateLines();
Expand Down Expand Up @@ -4226,6 +4294,12 @@ protected void handlePropertyChangeEvent(PropertyChangeEvent event) {
boolean b= fPreferenceStore.getBoolean(ComparePreferencePage.SYNCHRONIZE_SCROLLING);
setSyncScrolling(b);

} else if (key.equals(EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR)
|| key.equals(EDITOR_SELECTION_BACKGROUND_COLOR)
|| key.equals(EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR)
|| key.equals(EDITOR_SELECTION_FOREGROUND_COLOR)) {
updateColors(null);

} else if (key.equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND)) {
if (!fIsUsingSystemBackground) {
setBackgroundColor(createColor(fPreferenceStore, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND));
Expand Down
Loading