Bug 430848 - [Themes] Background changes to dark during the startup

splash screen

Change-Id: I70a5f641bf71411ab300206979301a5cc67ce5cf
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

3 files changed, 12 insertions, 3 deletions

diff --git a/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF
index 5c46be0c41a..efcfccf6511 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Version: 0.11.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.e4.ui.css.swt;x-internal:=true,
+Export-Package: org.eclipse.e4.ui.css.swt;x-friends:="org.eclipse.ui.workbench",
  org.eclipse.e4.ui.css.swt.dom;x-friends:="org.eclipse.e4.ui.workbench.swt",
  org.eclipse.e4.ui.css.swt.dom.definition;x-internal:=true,
  org.eclipse.e4.ui.css.swt.dom.html;x-internal:=true,
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css
index 774e7df4c03..f0128fc4203 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css
@@ -418,6 +418,10 @@ Label#org-eclipse-ui-splash-progressText {
 	color: #9c9696; /* see property startupForegroundColor in the product */
 }
 
+Label#org-eclipse-ui-buildid-text {
+	background-color: inherit; /* transparent */
+}
+
 ProgressIndicator#org-eclipse-ui-splash-progressIndicator {
 	background-color: #e1e1e1;
 }
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java
index 04eb33bbf7a..683e56e9f74 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java
@@ -7,11 +7,13 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 430848
  *******************************************************************************/
 package org.eclipse.ui.internal.splash;
 
 import org.eclipse.core.runtime.IProduct;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.ui.css.swt.CSSSWTConstants;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.RGB;
@@ -28,13 +30,16 @@ import org.eclipse.ui.splash.BasicSplashHandler;
  */
 public class EclipseSplashHandler extends BasicSplashHandler {
 
+	// CSS id can be used to style the label for the build ID
+	private static final String CSS_ID_SPLASH_BUILD_ID = "org-eclipse-ui-buildid-text"; //$NON-NLS-1$
+
 	/**
 	 * Initializes the splash screen.
 	 * <p>
 	 * <strong>WARNING:</strong> Do not change the default values as existing
 	 * products might rely on them.
 	 * </p>
-	 * 
+	 *
 	 * @param splash
 	 *            the shell that contains the splash screen
 	 */
@@ -96,7 +101,7 @@ public class EclipseSplashHandler extends BasicSplashHandler {
 			idLabel.setForeground(getForeground());
 			idLabel.setBounds(buildIdRectangle);
 			idLabel.setText(buildId);
-			
+			idLabel.setData(CSSSWTConstants.CSS_ID_KEY, CSS_ID_SPLASH_BUILD_ID);
 		}
 		else {
 			getContent(); // ensure creation of the progress