8391: Dark theme support for dials

Reviewed-by: bdutheil

Author: thegreystone

application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/CombinedDialsSectionPart.java

@@ -66,6 +66,7 @@
 import org.openjdk.jmc.rjmx.common.subscription.IMRIService;
 import org.openjdk.jmc.rjmx.common.subscription.IMRIValueListener;
 import org.openjdk.jmc.rjmx.common.subscription.ISubscriptionService;
+import org.openjdk.jmc.ui.common.util.ThemeUtils;
 import org.openjdk.jmc.rjmx.common.subscription.MRI;
 import org.openjdk.jmc.rjmx.common.subscription.MRIValueEvent;
 import org.openjdk.jmc.rjmx.subscription.MRIMetadataToolkit;
@@ -128,7 +129,7 @@ private class AttributeDial extends Dial implements IMRIValueListener {
 		private final RateLimitedRefresher infoRefresher;
 
 		AttributeDial(MRI mri, DialConfiguration dialConfiguration) {
-			super(m_dialsHolder, toolkit, dialConfiguration);
+			super(m_dialsHolder, toolkit, dialConfiguration, ThemeUtils.isDarkTheme());
 			this.mri = mri;
 			statistics = new StatisticsCalculator(mri);
 			infoRefresher = new RateLimitedRefresher(rateCoordinator, 100) {

application/org.openjdk.jmc.ui/icons/dial-bkgnd-dark.png

@@ -163,11 +163,17 @@ public class UIPlugin extends MCAbstractUIPlugin {
 
 	public static final String ICON_DIAL_PANEL = "single-dial.png"; //$NON-NLS-1$
 	public static final String ICON_DIAL_BACKGROUND = "dial-bkgnd.png"; //$NON-NLS-1$
+	public static final String ICON_DIAL_BACKGROUND_DARK = "dial-bkgnd-dark.png"; //$NON-NLS-1$
 	public static final String ICON_DIAL_PANEL2 = "dial2.png"; //$NON-NLS-1$TDial
 
 	public static final String ICON_DIAL_PANEL_1_10 = "dial_1_to_10.png"; //$NON-NLS-1$
 	public static final String ICON_DIAL_PANEL_10_100 = "dial_10_to_100.png"; //$NON-NLS-1$
 	public static final String ICON_DIAL_PANEL_100_1000 = "dial_100_to_1000.png"; //$NON-NLS-1$
+
+	public static final String ICON_DIAL_PANEL_1_10_DARK = "dial_1_to_10-dark.png"; //$NON-NLS-1$
+	public static final String ICON_DIAL_PANEL_10_100_DARK = "dial_10_to_100-dark.png"; //$NON-NLS-1$
+	public static final String ICON_DIAL_PANEL_100_1000_DARK = "dial_100_to_1000-dark.png"; //$NON-NLS-1$
+
 	public final static String ICON_DELETE = "delete-16.png"; //$NON-NLS-1$
 
 	public final static String ICON_MISSION_CONTROL = "mission_control.gif"; //$NON-NLS-1$
@@ -322,8 +328,12 @@ protected void initializeImageRegistry(ImageRegistry registry) {
 		registerImage(registry, ICON_DIAL_PANEL_1_10, ICON_DIAL_PANEL_1_10);
 		registerImage(registry, ICON_DIAL_PANEL_10_100, ICON_DIAL_PANEL_10_100);
 		registerImage(registry, ICON_DIAL_PANEL_100_1000, ICON_DIAL_PANEL_100_1000);
+		registerImage(registry, ICON_DIAL_PANEL_1_10_DARK, ICON_DIAL_PANEL_1_10_DARK);
+		registerImage(registry, ICON_DIAL_PANEL_10_100_DARK, ICON_DIAL_PANEL_10_100_DARK);
+		registerImage(registry, ICON_DIAL_PANEL_100_1000_DARK, ICON_DIAL_PANEL_100_1000_DARK);
 
 		registerImage(registry, ICON_DIAL_BACKGROUND, ICON_DIAL_BACKGROUND);
+		registerImage(registry, ICON_DIAL_BACKGROUND_DARK, ICON_DIAL_BACKGROUND_DARK);
 		registerImage(registry, ICON_FOLDER, ICON_FOLDER);
 		registerImage(registry, ICON_FOLDER_CLOSED, ICON_FOLDER_CLOSED);
 

application/org.openjdk.jmc.ui/icons/dial_100_to_1000-dark.png

@@ -64,8 +64,26 @@ public class Dial extends Composite {
 	 *            a widget which will be the parent of the new widget
 	 * @param toolkit
 	 *            the form toolkit in use
+	 * @param dialConfiguration
+	 *            the dial configuration to use
 	 */
 	public Dial(Composite parent, FormToolkit formToolkit, DialConfiguration dialConfiguration) {
+		this(parent, formToolkit, dialConfiguration, false);
+	}
+
+	/**
+	 * Creates the actual dial widget with theme support.
+	 *
+	 * @param parent
+	 *            a widget which will be the parent of the new widget
+	 * @param toolkit
+	 *            the form toolkit in use
+	 * @param dialConfiguration
+	 *            the dial configuration to use
+	 * @param isDarkMode
+	 *            whether to use dark mode styling
+	 */
+	public Dial(Composite parent, FormToolkit formToolkit, DialConfiguration dialConfiguration, boolean isDarkMode) {
 		super(parent, SWT.NONE);
 
 		GridLayout layout = new GridLayout();
@@ -75,7 +93,7 @@ public Dial(Composite parent, FormToolkit formToolkit, DialConfiguration dialCon
 		layout.marginWidth = 0;
 		setLayout(layout);
 
-		m_dialViewer = new DialViewer(this, SWT.NONE);
+		m_dialViewer = new DialViewer(this, SWT.NONE, isDarkMode);
 		FocusTracker.enableFocusTracking(m_dialViewer);
 		m_dialViewer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		formToolkit.adapt(m_dialViewer);

application/org.openjdk.jmc.ui/icons/dial_10_to_100-dark.png

@@ -42,6 +42,7 @@
 import org.openjdk.jmc.common.unit.QuantityConversionException;
 import org.openjdk.jmc.common.unit.UnitLookup;
 import org.openjdk.jmc.common.util.ColorToolkit;
+import org.openjdk.jmc.ui.common.util.ThemeUtils;
 
 public class DialConfiguration {
 
@@ -55,7 +56,7 @@ public class DialConfiguration {
 
 	private Color m_gradientBeginColor = new Color(107, 143, 183);
 	private Color m_gradientEndColor = new Color(107, 143, 183);
-	private Color m_waterMarkColor = new Color(150, 150, 150);
+	private Color m_waterMarkColor = ThemeUtils.isDarkTheme() ? new Color(80, 80, 80) : new Color(150, 150, 150);
 	private IQuantity m_gradientBeginValue;
 	private IQuantity m_gradientEndValue;
 	private boolean m_useWatermark = true;

application/org.openjdk.jmc.ui/icons/dial_1_to_10-dark.png

@@ -52,14 +52,24 @@ class DialDevice {
 			ImageDescription.createStandardConfiguration(
 					UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_PANEL_100_1000), 1000)};
 
+	private static final ImageDescription[] DARK_BACKGROUNDS = new ImageDescription[] {
+			ImageDescription.createStandardConfiguration(
+					UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_PANEL_1_10_DARK), 10),
+			ImageDescription.createStandardConfiguration(
+					UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_PANEL_10_100_DARK), 100),
+			ImageDescription.createStandardConfiguration(
+					UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_PANEL_100_1000_DARK), 1000)};
+
 	private final IUnit unit;
 	private final ImageDescription background;
 	private final Boolean positive;
+	private final boolean isDarkMode;
 
-	private DialDevice(IUnit unit, ImageDescription background, Boolean positive) {
+	private DialDevice(IUnit unit, ImageDescription background, Boolean positive, boolean isDarkMode) {
 		this.unit = unit;
 		this.background = background;
 		this.positive = positive;
+		this.isDarkMode = isDarkMode;
 	}
 
 	String getTitle() {
@@ -95,20 +105,21 @@ static Rectangle getBackgroundSize() {
 		return BACKGROUNDS[0].image.getBounds();
 	}
 
-	static DialDevice buildSuitableDevice(double minValue, double maxValue, IUnit inUnit) {
+	static DialDevice buildSuitableDevice(double minValue, double maxValue, IUnit inUnit, boolean isDarkMode) {
 		if (minValue > maxValue || Double.isInfinite(minValue) || Double.isInfinite(maxValue)) {
 			// no value background
 			return new DialDevice(inUnit.getContentType().getPreferredUnit(inUnit.quantity(1), 1.0, 1000),
-					BACKGROUNDS[0], true);
+					isDarkMode ? DARK_BACKGROUNDS[0] : BACKGROUNDS[0], true, isDarkMode);
 		}
 		IQuantity quantity = inUnit.quantity(Math.max(Math.abs(minValue), Math.abs(maxValue)));
 		IUnit preferredUnit = inUnit.getContentType().getPreferredUnit(quantity, 1.0,
 				BACKGROUNDS[BACKGROUNDS.length - 1].dialEndValue);
 		double value = quantity.doubleValueIn(preferredUnit);
-		for (ImageDescription bg : BACKGROUNDS) {
+		ImageDescription[] backgrounds = isDarkMode ? DARK_BACKGROUNDS : BACKGROUNDS;
+		for (ImageDescription bg : backgrounds) {
 			if (value <= bg.dialEndValue) {
 				Boolean positive = maxValue < 0 ? Boolean.FALSE : (minValue < 0 ? null : Boolean.TRUE);
-				return new DialDevice(preferredUnit, bg, positive);
+				return new DialDevice(preferredUnit, bg, positive, isDarkMode);
 			}
 		}
 
@@ -118,7 +129,7 @@ static DialDevice buildSuitableDevice(double minValue, double maxValue, IUnit in
 		 * Choosing a hopefully useful dial device, but too large values will be normalized to 1.
 		 * Consider throwing an exception instead.
 		 */
-		return new DialDevice(preferredUnit, BACKGROUNDS[BACKGROUNDS.length - 1], true);
+		return new DialDevice(preferredUnit, backgrounds[backgrounds.length - 1], true, isDarkMode);
 		// throw new IllegalArgumentException("Cannot find a suitable dial device");
 	}
 }

application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/UIPlugin.java

@@ -83,6 +83,7 @@ public class DialViewer extends Composite implements IRefreshable {
 	// Model
 	private IDialProvider[] m_dials = new IDialProvider[] {};
 	final private Map<String, Object> m_inputs = new LinkedHashMap<>();
+	private final boolean m_isDarkMode;
 
 	// listeners
 	final private MCAccessibleListener m_accessibleListener;
@@ -109,7 +110,23 @@ public class DialViewer extends Composite implements IRefreshable {
 	 * @param configuration
 	 */
 	public DialViewer(Composite parent, int style) {
+		this(parent, style, false);
+	}
+
+	/**
+	 * Constructs a {@link DialViewer} with a given configuration on the parent composite,
+	 * respecting the theme settings.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param style
+	 *            the SWT style
+	 * @param isDarkMode
+	 *            whether to use dark mode dial images
+	 */
+	public DialViewer(Composite parent, int style, boolean isDarkMode) {
 		super(parent, SWT.DOUBLE_BUFFERED);
+		m_isDarkMode = isDarkMode;
 
 		m_accessibleListener = new MCAccessibleListener();
 		m_accessibleListener.setComponentType(AccessibilityConstants.COMPONENT_TYPE_DIAL);
@@ -352,7 +369,7 @@ private void draw(GC gc, int x, int y, int width, int height, boolean drawOptima
 			maxValue = Math.max(maxValue, values[n]);
 			minValue = Math.min(minValue, values[n]);
 		}
-		DialDevice dd = DialDevice.buildSuitableDevice(minValue, maxValue, getUnit());
+		DialDevice dd = DialDevice.buildSuitableDevice(minValue, maxValue, getUnit(), m_isDarkMode);
 		ImageDescription bgConfig = dd.getBackground();
 		Rectangle size = bgConfig.image.getBounds();
 		int xOffset = (width - size.width) / 2;
@@ -413,7 +430,12 @@ private void createBackground(DialDevice dialDevice, int width, int height, int
 		Image panelImage = new Image(getDisplay(), bgBounds.width, bgBounds.height);
 
 		GC dialGC = new GC(panelImage);
-		Image g = UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_BACKGROUND);
+		Image g;
+		if (m_isDarkMode) {
+			g = UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_BACKGROUND_DARK);
+		} else {
+			g = UIPlugin.getDefault().getImage(UIPlugin.ICON_DIAL_BACKGROUND);
+		}
 		for (int i = 0; i < panelImage.getBounds().width; i += g.getBounds().width) {
 			dialGC.drawImage(g, i, 0);
 		}
@@ -456,8 +478,12 @@ private void drawDialText(GC gc, int xOffset, int YOffset, ImageDescription conf
 		int x = config.dialTextCenter.x - textExtent.x / 2 + xOffset;
 		int y = config.dialTextCenter.y - textExtent.y / 2 + YOffset;
 
-		// FIXME: Once we have dark background dials we should just use the default fg color...
-		Color foreground = new Color(gc.getDevice(), 0, 0, 0);
+		Color foreground;
+		if (m_isDarkMode) {
+			foreground = new Color(gc.getDevice(), 255, 255, 255);
+		} else {
+			foreground = new Color(gc.getDevice(), 0, 0, 0);
+		}
 		gc.setForeground(foreground);
 
 		gc.setAlpha(192);
@@ -506,5 +532,4 @@ private void drawUnNormalizedbackground(GC gc, DialDevice dialDevice, RGB startR
 			color.dispose();
 		}
 	}
-
 }

application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/dial/Dial.java

@@ -34,6 +34,7 @@
 
 import java.awt.Color;
 
+import org.openjdk.jmc.ui.common.util.ThemeUtils;
 import org.openjdk.jmc.ui.dial.MovingDial.RK2Solver.DifferentialEquation;
 
 /**
@@ -104,7 +105,7 @@ public MovingDial(String id, Color color) {
 	}
 
 	public MovingDial(String id) {
-		this(id, new Color(0, 0, 0));
+		this(id, getDefaultDialColor());
 	}
 
 	/**
@@ -374,6 +375,10 @@ private double currentTime() {
 		return System.currentTimeMillis() / (1000.0) - m_timeOffset;
 	}
 
+	private static Color getDefaultDialColor() {
+		return ThemeUtils.isDarkTheme() ? new Color(255, 255, 255) : new Color(0, 0, 0);
+	}
+
 	@Override
 	public String getId() {
 		return m_id;