Add preference for using desaturated disabled icons

This adds a preference which enables the use of desaturated disabled
icons, which replaces the existing algorithm to create grayscaled
version with an algorithm that generates a desaturated version.

Author: HeikoKlare

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IWorkbenchPreferenceConstants.java

@@ -732,4 +732,14 @@ public interface IWorkbenchPreferenceConstants {
 	 */
 	String IGNORE_DISABLED_ICONS = "ignoreDisabledIcons"; //$NON-NLS-1$
 
+	/**
+	 * <p>
+	 * Whether to use a different algorithm for generating disabled icons that
+	 * desaturates the icons rather than making them completely grayscaled.
+	 * </p>
+	 *
+	 * @since 3.139
+	 */
+	String USE_DESATURATED_DISABLED_ICONS = "desaturatedDisabledIcons"; //$NON-NLS-1$
+
 }

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java

@@ -484,6 +484,8 @@ public class WorkbenchMessages extends NLS {
 	public static String ViewsPreference_disabledIcons_description;
 	public static String ViewsPreference_ignoreDisabledIcons;
 	public static String ViewsPreference_ignoreDisabledIcons_tooltip;
+	public static String ViewsPreference_useDesaturatedDisabledIcons;
+	public static String ViewsPreference_useDesaturatedDisabledIcons_tooltip;
 	public static String ToggleFullScreenMode_ActivationPopup_Description;
 	public static String ToggleFullScreenMode_ActivationPopup_Description_NoKeybinding;
 	public static String ToggleFullScreenMode_ActivationPopup_DoNotShowAgain;

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java

@@ -116,6 +116,7 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 	private Button themingEnabled;
 	private Button rescaleAtRuntime;
 	private Button ignoreDisabledIcons;
+	private Button useDesaturatedDisabledIcons;
 
 	private Button hideIconsForViewTabs;
 	private Button showFullTextForViewTabs;
@@ -247,6 +248,13 @@ private void createDisabledIconsButtons(Composite parent) {
 		ignoreDisabledIcons = createCheckButton(parent, WorkbenchMessages.ViewsPreference_ignoreDisabledIcons,
 				initialStateIgnoreDisabledIcons);
 		ignoreDisabledIcons.setToolTipText(WorkbenchMessages.ViewsPreference_ignoreDisabledIcons_tooltip);
+
+		boolean initialStateDesaturatedDisabledIcons = PrefUtil.getAPIPreferenceStore()
+				.getBoolean(IWorkbenchPreferenceConstants.USE_DESATURATED_DISABLED_ICONS);
+		useDesaturatedDisabledIcons = createCheckButton(parent,
+				WorkbenchMessages.ViewsPreference_useDesaturatedDisabledIcons, initialStateDesaturatedDisabledIcons);
+		useDesaturatedDisabledIcons
+				.setToolTipText(WorkbenchMessages.ViewsPreference_useDesaturatedDisabledIcons_tooltip);
 	}
 
 	private void createThemeIndependentComposits(Composite comp) {
@@ -380,6 +388,8 @@ public boolean performOk() {
 		}
 		PrefUtil.getAPIPreferenceStore().setValue(IWorkbenchPreferenceConstants.IGNORE_DISABLED_ICONS,
 				ignoreDisabledIcons.getSelection());
+		PrefUtil.getAPIPreferenceStore().setValue(IWorkbenchPreferenceConstants.USE_DESATURATED_DISABLED_ICONS,
+				useDesaturatedDisabledIcons.getSelection());
 
 		boolean isRescaleAtRuntimeChanged = false;
 		if (rescaleAtRuntime != null) {
@@ -485,6 +495,8 @@ protected void performDefaults() {
 		useColoredLabels.setSelection(apiStore.getDefaultBoolean(IWorkbenchPreferenceConstants.USE_COLORED_LABELS));
 		ignoreDisabledIcons
 				.setSelection(apiStore.getDefaultBoolean(IWorkbenchPreferenceConstants.IGNORE_DISABLED_ICONS));
+		useDesaturatedDisabledIcons
+				.setSelection(apiStore.getDefaultBoolean(IWorkbenchPreferenceConstants.USE_DESATURATED_DISABLED_ICONS));
 
 		useRoundTabs.setSelection(
 				defaultPrefs.getBoolean(CTabRendering.USE_ROUND_TABS, CTabRendering.USE_ROUND_TABS_DEFAULT));

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties

@@ -438,6 +438,9 @@ ViewsPreference_viewTabs_icons_and_titles_label = Tab icons and titles in view a
 ViewsPreference_disabledIcons_description = Icons for disabled actions:
 ViewsPreference_ignoreDisabledIcons = Ignore pre-generated disabled icons
 ViewsPreference_ignoreDisabledIcons_tooltip = When enabled ignores pre-generated disabled icons in favor of generating consistently styled disabled icons on the fly
+ViewsPreference_useDesaturatedDisabledIcons = Use desaturated instead of grayscaled disabled icons
+ViewsPreference_useDesaturatedDisabledIcons_tooltip = Changes the styling of disabled icons to use a desaturated icon version instead of a grayscaled one 
+
 ToggleFullScreenMode_ActivationPopup_Description=You have gone full screen. Use the Toggle Full Screen command ({0}) to deactivate.
 ToggleFullScreenMode_ActivationPopup_Description_NoKeybinding=You have gone full screen. Use the Toggle Full Screen command to deactivate.
 ToggleFullScreenMode_ActivationPopup_DoNotShowAgain=Do not show again

bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPlugin.java

@@ -108,6 +108,12 @@ private void initializeIconConfigurations() {
 		boolean ignoreDisabledIcons = PrefUtil.getAPIPreferenceStore()
 				.getBoolean(IWorkbenchPreferenceConstants.IGNORE_DISABLED_ICONS);
 		ActionContributionItem.setIgnoreDisabledIcons(ignoreDisabledIcons);
+
+		boolean useDesaturatedDisabledIcons = PrefUtil.getAPIPreferenceStore()
+				.getBoolean(IWorkbenchPreferenceConstants.USE_DESATURATED_DISABLED_ICONS);
+		if (useDesaturatedDisabledIcons) {
+			System.setProperty("org.eclipse.swt.image.disablement", "desaturated"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
 	}
 
 }

bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java

@@ -62,6 +62,7 @@ public void initializeDefaultPreferences() {
 
 		node.putBoolean(IWorkbenchPreferenceConstants.USE_COLORED_LABELS, true);
 		node.putBoolean(IWorkbenchPreferenceConstants.IGNORE_DISABLED_ICONS, true);
+		node.putBoolean(IWorkbenchPreferenceConstants.USE_DESATURATED_DISABLED_ICONS, true);
 		node.putBoolean(
 				IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR,
 				false);