Reset in colors preference page now respects theme-specific defaults

Author: tobias-melcher

bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/preference/EclipsePreferencesHandler.java

@@ -15,11 +15,15 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.eclipse.e4.ui.css.swt.dom.preference.EclipsePreferencesElement;
 import org.eclipse.e4.ui.css.swt.helpers.EclipsePreferencesHelper;
+import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.graphics.RGB;
 import org.w3c.dom.css.CSSValue;
 import org.w3c.dom.css.CSSValueList;
 
@@ -61,5 +65,18 @@ protected void overrideProperty(IEclipsePreferences preferences, String name, St
 			preferences.put(name, value);
 			EclipsePreferencesHelper.appendOverriddenPropertyName(preferences, name);
 		}
+		ColorRegistry colorRegistry = JFaceResources.getColorRegistry();
+		if (colorRegistry != null) {
+			RGB rgb = colorRegistry.getRGB(name);
+			if (rgb != null) {
+				IEclipsePreferences defaultPrefs = DefaultScope.INSTANCE.getNode(preferences.name());
+				if (defaultPrefs != null) {
+					String existing = defaultPrefs.get(name, null);
+					if (existing != null && value != null && existing.equals(value) == false) {
+						defaultPrefs.put(name, value);
+					}
+				}
+			}
+		}
 	}
 }

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorDefinition.java

@@ -155,4 +155,13 @@ public void setValue(RGB data) {
 			appendState(State.OVERRIDDEN);
 		}
 	}
+
+	void setRawValue(String v) {
+		rawValue = v;
+		parsedValue = null;
+	}
+
+	String getRawValue() {
+		return rawValue;
+	}
 }

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java

@@ -35,6 +35,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.resource.JFaceResources;
@@ -1270,6 +1271,21 @@ public void init(IWorkbench aWorkbench) {
 		eventBroker.subscribe(WorkbenchThemeManager.Events.THEME_REGISTRY_RESTYLED, themeRegistryRestyledHandler);
 	}
 
+	private void setOverriddenColorDefaultsFromCss(ColorDefinition[] colorDefinitions) {
+		if (colorDefinitions == null || colorDefinitions.length == 0) {
+			return;
+		}
+		for (ColorDefinition def : colorDefinitions) {
+			String defaultString = getPreferenceStore().getDefaultString(def.getId());
+			if (defaultString != null) {
+				String rawValue = def.getRawValue();
+				if (rawValue != null && rawValue.equals(defaultString) == false) {
+					def.setRawValue(defaultString);
+				}
+			}
+		}
+	}
+
 	private void updateThemeInfo(IThemeManager manager) {
 		clearPreviews();
 		categoryMap.clear();
@@ -1284,6 +1300,9 @@ private void updateThemeInfo(IThemeManager manager) {
 
 		currentTheme = manager.getCurrentTheme();
 
+		ColorDefinition[] colorDefinitions = themeRegistry.getColorsFor(currentTheme.getId());
+		setOverriddenColorDefaultsFromCss(colorDefinitions);
+
 		currentCSSTheme = getActiveTheme();
 
 		colorRegistry = new CascadingColorRegistry(currentTheme.getColorRegistry());
@@ -1330,7 +1349,12 @@ private boolean isDefault(ColorDefinition definition) {
 					return true;
 			}
 		} else if (definition.getValue() != null) { // value-based color
-			if (getPreferenceStore().isDefault(createPreferenceKey(definition)))
+			IPreferenceStore store = getPreferenceStore();
+			String defaultString = store.getDefaultString(id);
+			String string = store.getString(id);
+			if (defaultString != null && string != null && defaultString.equals(string))
+				return true;
+			if (store.isDefault(createPreferenceKey(definition)))
 				return true;
 		} else {
 			// a descendant is default if it's the same value as its ancestor