Bug 575585: [NiConsole] Disable css styling for prompt area

Change-Id: Icd45e0af0bbc6305e27ff4b3934486767f594551

2 files changed, 18 insertions, 9 deletions

diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/console/PromptHighlighter.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/console/PromptHighlighter.java
index a4d17318..f0ccf2c7 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/console/PromptHighlighter.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/console/PromptHighlighter.java
@@ -28,13 +28,18 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.editors.text.EditorsUI;
 
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
 import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
 import org.eclipse.statet.ecommons.ui.util.UIAccess;
+import org.eclipse.statet.ecommons.ui.workbench.StylingUtils;
 
 import org.eclipse.statet.nico.ui.console.NIConsoleColorAdapter;
 import org.eclipse.statet.nico.ui.console.NIConsoleOutputStream;
 
 
+@NonNullByDefault
 public class PromptHighlighter implements IPropertyChangeListener {
 	
 	
@@ -44,8 +49,8 @@ public class PromptHighlighter implements IPropertyChangeListener {
 	private final PreferenceAccess prefAccess;
 	private final ISharedTextColors sharedColors;
 	
-	private Color foregroundColor;
-	private Color backgroundColor;
+	private @Nullable Color foregroundColor;
+	private @Nullable Color backgroundColor;
 	
 	private boolean isHighlightEnabled;
 	
@@ -53,6 +58,7 @@ public class PromptHighlighter implements IPropertyChangeListener {
 	public PromptHighlighter(final Control control,
 			final PreferenceAccess prefAccess, final IPreferenceStore preferenceStore) {
 		this.control= control;
+		StylingUtils.disableStyling(control);
 		this.prefAccess= prefAccess;
 		this.preferenceStore= preferenceStore;
 		this.sharedColors= EditorsUI.getSharedTextColors();
diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/console/NIConsolePage.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/console/NIConsolePage.java
index cb479a78..b91a365c 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/console/NIConsolePage.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/console/NIConsolePage.java
@@ -126,6 +126,7 @@ import org.eclipse.statet.ecommons.ui.util.LayoutUtils;
 import org.eclipse.statet.ecommons.ui.util.NestedServices;
 import org.eclipse.statet.ecommons.ui.util.UIAccess;
 import org.eclipse.statet.ecommons.ui.workbench.ContextHandlers;
+import org.eclipse.statet.ecommons.ui.workbench.StylingUtils;
 import org.eclipse.statet.ecommons.ui.workbench.texteditor.ActionHandler;
 
 import org.eclipse.statet.internal.nico.ui.LocalTaskTransfer;
@@ -563,14 +564,16 @@ public abstract class NIConsolePage implements IPageBookViewPage,
 			protected void updateColors(final ISourceViewer viewer, final StyledText styledText) {
 				super.updateColors(viewer, styledText);
 				
-				sash.setBackground(null);
-				final Color outputBackground= styledText.getBackground();
-				if (outputBackground.equals(sash.getBackground())) {
-					Color altColor= styledText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-					if (outputBackground.equals(altColor)) {
-						altColor= styledText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
+				if (!StylingUtils.isStylingSupported()) {
+					sash.setBackground(null);
+					final Color outputBackground= styledText.getBackground();
+					if (outputBackground.equals(sash.getBackground())) {
+						Color altColor= styledText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
+						if (outputBackground.equals(altColor)) {
+							altColor= styledText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
+						}
+						sash.setBackground(altColor);
 					}
-					sash.setBackground(altColor);
 				}
 			}
 		};