From ebf123102f1efb28fee029b1844ce733a37335df Mon Sep 17 00:00:00 2001 From: Sebastian Focke Date: Sat, 10 Mar 2018 22:52:23 +0100 Subject: [PATCH] Bug 282494 - Incorrect colors in Show Macro expansion dialog in case of dark color scheme Setting the Macro expansion highlight to the "Find Scope" color. The color can not occur by other means in the dialog and provides good contrast to background and foreground colors. Change-Id: If2182cff20f3612cff80c7fe2b250d039d45f172 Signed-off-by: Sebastian Focke --- .../cdt/internal/ui/text/c/hover/CMacroCompareViewer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java index d392356e60a..45c961e4120 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java @@ -25,6 +25,7 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Composite; import org.eclipse.text.edits.ReplaceEdit; +import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.cdt.core.dom.rewrite.MacroExpansionExplorer.IMacroExpansionStep; @@ -118,7 +119,11 @@ class CMacroCompareViewer extends CMergeViewer { public CMacroCompareViewer(Composite parent, int styles, CompareConfiguration mp) { super(parent, styles, mp); - fChangeBackground= new Color(parent.getDisplay(), CHANGE_COLOR); + RGB expansionHighlight = CMacroCompareViewer.createColor(getPreferenceStore(), + AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE); + if(expansionHighlight == null) + expansionHighlight = CHANGE_COLOR; + fChangeBackground= new Color(parent.getDisplay(), expansionHighlight); fLeftHighlighter= new ReplaceEditsHighlighter(fChangeBackground, true); fRightHighlighter= new ReplaceEditsHighlighter(fChangeBackground, false); fViewerIndex= 0;