Reset in colors preference page now respects theme-specific defaults

Author: tobias-melcher

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

@@ -1317,13 +1317,13 @@ private boolean isDefault(ColorDefinition definition) {
 
 		if (colorPreferencesToSet.containsKey(definition)) {
 			if (definition.getValue() != null) { // value-based color
-				if (colorPreferencesToSet.get(definition).equals(definition.getValue()))
+				if (colorPreferencesToSet.get(definition).equals(getColorRGB(definition)))
 					return true;
 			} else if (colorPreferencesToSet.get(definition).equals(getColorAncestorValue(definition)))
 				return true;
 		} else if (colorValuesToSet.containsKey(id)) {
 			if (definition.getValue() != null) { // value-based color
-				if (colorValuesToSet.get(id).equals(definition.getValue()))
+				if (colorValuesToSet.get(id).equals(getColorRGB(definition)))
 					return true;
 			} else {
 				if (colorValuesToSet.get(id).equals(getColorAncestorValue(definition)))
@@ -1517,7 +1517,7 @@ private boolean resetColor(ColorDefinition definition, boolean force) {
 		if (force || !isDefault(definition)) {
 			RGB newRGB;
 			if (definition.getValue() != null)
-				newRGB = definition.getValue();
+				newRGB = getColorRGB(definition);
 			else
 				newRGB = getColorAncestorValue(definition);
 
@@ -1531,6 +1531,18 @@ private boolean resetColor(ColorDefinition definition, boolean force) {
 		return false;
 	}
 
+	private RGB getColorRGB(ColorDefinition definition) {
+		RGB rgb = definition.getValue();
+		if (currentTheme != null && currentTheme.getColorRegistry() != null && definition.getId() != null) {
+			String colorKey = ThemeElementHelper.createPreferenceKey(currentTheme, definition.getId());
+			RGB themeRgb = currentTheme.getColorRegistry().getRGB(colorKey);
+			if (themeRgb != null) {
+				rgb = themeRgb;
+			}
+		}
+		return rgb;
+	}
+
 	protected boolean resetFont(FontDefinition definition, boolean force) {
 		if (force || !isDefault(definition)) {
 			FontData[] newFD;