8248: [Accessibility] Low Contrast in High Contrast mode on Stacktrace View

Co-authored-by: Marcus Hirt <hirt@openjdk.org>
Reviewed-by: aptmac, bdutheil

Author: Suchita Chaturvedi

application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/views/stacktrace/StacktraceView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -134,6 +134,7 @@
 import org.openjdk.jmc.ui.UIPlugin;
 import org.openjdk.jmc.ui.accessibility.FocusTracker;
 import org.openjdk.jmc.ui.common.util.AdapterUtil;
+import org.openjdk.jmc.ui.common.util.ThemeUtils;
 import org.openjdk.jmc.ui.handlers.ActionToolkit;
 import org.openjdk.jmc.ui.handlers.CopySelectionAction;
 import org.openjdk.jmc.ui.handlers.InFocusHandlerActivator;
@@ -212,8 +213,10 @@ public void run() {
 	private static final Color ALTERNATE_COLOR = SWTColorToolkit.getColor(new RGB(255, 255, 240));
 	private static final String COUNT_IMG_KEY = "countColor"; //$NON-NLS-1$
 	private static final Color COUNT_COLOR = SWTColorToolkit.getColor(new RGB(100, 200, 100));
+	private static final Color COUNT_COLOR_DARK_MODE = SWTColorToolkit.getColor(new RGB(7, 94, 7));
 	private static final String SIBLINGS_IMG_KEY = "siblingsColor"; //$NON-NLS-1$
 	private static final Color SIBLINGS_COUNT_COLOR = SWTColorToolkit.getColor(new RGB(170, 250, 170));
+	private static final Color SIBLINGS_COUNT_COLOR_DARK_MODE = SWTColorToolkit.getColor(new RGB(8, 115, 8));
 	private static final int[] DEFAULT_COLUMN_WIDTHS = {650, 80, 120};
 	private static final String THREAD_ROOT_KEY = "threadRootAtTop"; //$NON-NLS-1$
 	private static final String FRAME_OPTIMIZATION_KEY = "distinguishFramesByOptimization"; //$NON-NLS-1$
@@ -860,12 +863,13 @@ public void handleEvent(Event event) {
 				long forkOffset = parentFork.getItemOffset();
 				int siblingsStart = (int) Math.floor(event.width * forkOffset / total);
 				int siblingsWidth = (int) Math.round(event.width * parentFork.getAggregateItemsInFork() / total);
-				event.gc.setBackground(SIBLINGS_COUNT_COLOR);
+				event.gc.setBackground(
+						ThemeUtils.isDarkTheme() ? SIBLINGS_COUNT_COLOR_DARK_MODE : SIBLINGS_COUNT_COLOR);
 				event.gc.fillRectangle(event.x + siblingsStart, event.y, siblingsWidth, event.height);
 				// Draw group
 				double offset = (forkOffset + frame.getBranch().getItemOffsetInFork()) / total;
 				double fraction = frame.getAttributeAggregate() / total;
-				event.gc.setBackground(COUNT_COLOR);
+				event.gc.setBackground(ThemeUtils.isDarkTheme() ? COUNT_COLOR_DARK_MODE : COUNT_COLOR);
 				int startPixel = (int) Math.floor(event.width * offset);
 				int widthPixel = (int) Math.round(event.width * fraction);
 				event.gc.fillRectangle(event.x + startPixel, event.y, Math.max(widthPixel, 1), event.height);
@@ -886,12 +890,13 @@ public void handleEvent(Event event) {
 				long forkOffset = parentFork.getItemOffset();
 				int siblingsStart = (int) Math.floor(event.width * forkOffset / total);
 				int siblingsWidth = (int) Math.round(event.width * parentFork.getAggregateItemsInFork() / total);
-				event.gc.setBackground(SIBLINGS_COUNT_COLOR);
+				event.gc.setBackground(
+						ThemeUtils.isDarkTheme() ? SIBLINGS_COUNT_COLOR_DARK_MODE : SIBLINGS_COUNT_COLOR);
 				event.gc.fillRectangle(event.x + siblingsStart, event.y, siblingsWidth, event.height);
 				// Draw group
 				double offset = (forkOffset + frame.getBranch().getItemOffsetInFork()) / total;
 				double fraction = frame.getAttributeAggregate() / total;
-				event.gc.setBackground(COUNT_COLOR);
+				event.gc.setBackground(ThemeUtils.isDarkTheme() ? COUNT_COLOR_DARK_MODE : COUNT_COLOR);
 				int startPixel = (int) Math.floor(event.width * offset);
 				int widthPixel = (int) Math.round(event.width * fraction);
 				event.gc.fillRectangle(event.x + startPixel, event.y, Math.max(widthPixel, 1), event.height);
@@ -1057,7 +1062,7 @@ public Image getImage(Object element) {
 
 		@Override
 		public Color getBackground(Object element) {
-			if (treeLayout) {
+			if (treeLayout || ThemeUtils.isDarkTheme()) {
 				return null;
 			} else {
 				int parentCount = 0;

application/org.openjdk.jmc.ui.common/META-INF/MANIFEST.MF

@@ -7,7 +7,9 @@ Bundle-Version: 9.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.ui.common.CorePlugin
 Bundle-Vendor: Oracle Corporation
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.openjdk.jmc.common;visibility:=reexport
+ org.openjdk.jmc.common;visibility:=reexport,
+ org.eclipse.jface,
+ org.eclipse.ui.workbench
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.expressions
 Export-Package: org.openjdk.jmc.ui.common,

application/org.openjdk.jmc.ui.common/src/main/java/org/openjdk/jmc/ui/common/util/ThemeUtils.java

@@ -0,0 +1,57 @@
+package org.openjdk.jmc.ui.common.util;
+
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+import org.eclipse.jface.preference.JFacePreferences;
+import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.PlatformUI;
+
+public class ThemeUtils {
+
+	private static boolean isCurrentThemeDark;
+
+	static {
+		updateCurrentThemeDarkModeStatus(); // To Initialize the value
+		IPropertyChangeListener propertyChangeListener = new IPropertyChangeListener() {
+
+			public void propertyChange(PropertyChangeEvent event) {
+				if (event.getProperty().equalsIgnoreCase(JFacePreferences.CONTENT_ASSIST_BACKGROUND_COLOR)) {
+					updateCurrentThemeDarkModeStatus(); // To update the value whenever property changes
+				}
+
+			}
+
+		};
+		PlatformUI.getWorkbench().getThemeManager().addPropertyChangeListener(propertyChangeListener);
+
+	}
+
+	public static boolean isDarkTheme() {
+		return isCurrentThemeDark;
+	}
+
+	private static final double BRIGHTNESS_THRESHOLD = 0.5;
+
+	private static void updateCurrentThemeDarkModeStatus() {
+		ColorRegistry colorRegistry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+		RGB backgroundColor = colorRegistry.getRGB(JFacePreferences.CONTENT_ASSIST_BACKGROUND_COLOR);
+
+		if (backgroundColor == null) {
+			// Fallback to a default behavior if the color is not available
+			isCurrentThemeDark = false;
+		} else {
+			isCurrentThemeDark = calculateBrightness(backgroundColor) < BRIGHTNESS_THRESHOLD;
+		}
+
+	}
+
+	private static double calculateBrightness(RGB color) {
+		// Using the HSP color model for perceived brightness
+		// See: http://alienryderflex.com/hsp.html
+		return Math.sqrt(
+				0.299 * color.red * color.red + 0.587 * color.green * color.green + 0.114 * color.blue * color.blue)
+				/ 255.0;
+	}
+}