fix info color problems like bug 329720
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
index 90634c8..88efe21 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
@@ -764,11 +764,13 @@
* @return the created label
*/
protected Label createEntry(Composite parent, Image icon, String text) {
+ Color fg = parent.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ Color bg = parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
if (icon != null) {
Label iconLabel = new Label(parent, SWT.NONE);
iconLabel.setImage(icon);
- iconLabel.setBackground(parent.getDisplay().getSystemColor(
- SWT.COLOR_INFO_BACKGROUND));
+ iconLabel.setForeground(fg);
+ iconLabel.setBackground(bg);
iconLabel.setData(new GridData());
}
@@ -781,8 +783,8 @@
}
textLabel.setText(text);
- textLabel.setBackground(parent.getDisplay().getSystemColor(
- SWT.COLOR_INFO_BACKGROUND));
+ textLabel.setForeground(fg);
+ textLabel.setBackground(bg);
return textLabel;
}
@@ -803,11 +805,13 @@
*/
protected Link createEntryWithLink(Composite parent, Image icon,
String text) {
+ Color fg = parent.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ Color bg = parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
if (icon != null) {
Label iconLabel = new Label(parent, SWT.NONE);
iconLabel.setImage(icon);
- iconLabel.setBackground(parent.getDisplay().getSystemColor(
- SWT.COLOR_INFO_BACKGROUND));
+ iconLabel.setForeground(fg);
+ iconLabel.setBackground(bg);
iconLabel.setData(new GridData());
}
@@ -818,8 +822,8 @@
}
textLink.setText(text);
- textLink.setBackground(parent.getDisplay().getSystemColor(
- SWT.COLOR_INFO_BACKGROUND));
+ textLink.setForeground(fg);
+ textLink.setBackground(bg);
return textLink;
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java
index 1d929b9..0b36ab2 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java
@@ -10,14 +10,13 @@
*******************************************************************************/
package org.eclipse.ui.internal.handlers;
-import org.eclipse.ui.internal.testing.ContributionInfoMessages;
-
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.window.ToolTip;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
@@ -30,6 +29,7 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.internal.testing.ContributionInfoMessages;
import org.eclipse.ui.internal.util.Util;
import org.eclipse.ui.testing.ContributionInfo;
import org.osgi.framework.Bundle;
@@ -114,10 +114,13 @@
protected Composite createToolTipContentArea(Event event, Composite parent) {
// Create the content area
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(parent.getDisplay().getSystemColor(
- SWT.COLOR_INFO_BACKGROUND));
+ Color fg = parent.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ Color bg = parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
+ composite.setForeground(fg);
+ composite.setBackground(bg);
Text text = new Text(composite, SWT.READ_ONLY);
- text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ text.setForeground(fg);
+ text.setBackground(bg);
String info = NLS.bind(ContributionInfoMessages.ContributionInfo_ContributedBy,
contributionInfo.getElementType(), contributionInfo.getBundleId());
text.setText(info);
