Bug 539661 - inconsistent background color for view toolbars in dark
theme
Keeps also the special entries for toolbar from the original
contribution. Not all of them are SWT standard components but we keep
them to avoid regressions.
Change-Id: I72831256902325cd8cd5612e0f664e9c57bc418a
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
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 ebe2355..b81ca80 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
@@ -29,7 +29,7 @@
/* ############################## Global Styles ############################## */
Composite, ScrolledComposite, ExpandableComposite, Canvas, TabFolder, CLabel, Label,
-CoolBar, ToolBar, ToolItem, Sash, Group, Hyperlink, RefactoringLocationControl, ChangeParametersControl, Link, FilteredTree,
+CoolBar, ToolItem, Sash, Group, Hyperlink, RefactoringLocationControl, ChangeParametersControl, Link, FilteredTree,
ProxyEntriesComposite, NonProxyHostsComposite, DelayedFilterCheckboxTree,
Splitter, ScrolledPageContent, ViewForm, LaunchConfigurationFilteredTree,
ContainerSelectionGroup, BrowseCatalogItem, EncodingSettings,
@@ -40,7 +40,6 @@
QualifiedNameComponent, RefactoringStatusViewer, ImageHyperlink,
MessageLine,
Button /* SWT-BUG: checkbox inner label font color is not accessible */,
-ViewForm > ToolBar, /* SWT-BUG: ToolBar do not inherit rules from ViewForm */
/*Shell [style~='SWT.DROP_DOWN'] > GradientCanvas,*/ /* ignored */
/* SWT-BUG dirty workaround [Eclipse Bug 419482]: a generic rule (eg: Composite > *) needed to catch an
element without a CSS id, a CSS class and a seekable Widget name, cannot be overridden
@@ -51,7 +50,6 @@
DocCommentOwnerComposite > Group > *, /* Group > DocCommentOwnerComposite$... */
TabFolder > Composite > ScrolledComposite > *, /* ScrolledComposite > ControlListViewer$... */
Shell > Composite > Composite > *, /* Composite > StatusDialog$MessageLine (SWT-BUG: ignored) */
-Composite > Composite > Composite > ToolBar, /* Window->Preference (top toolbar) */
Composite > Composite > Composite > Group > *, /* Group > CreateRefactoringScriptWizardPage$... */
Shell > Composite > Composite > Composite > *, /* Composite > FilteredPreferenceDialog$... */
ScrolledComposite > Composite > Composite > Composite > *, /* Composite > NewKeysPreferencePage$... */
@@ -63,6 +61,21 @@
color:#eeeeee;
}
+/* ############################## Toolbar ############################## */
+/* Toolbar should inherit the colors of its container to avoid drawing artifacts*/
+
+CTabFolder > Composite > *, /* Contains the toolbar entries for the view toolbar */
+Toolbar,
+Composite > Composite > Composite > ToolBar, /* Window->Preference (top toolbar) */
+ViewForm > ToolBar, /* SWT-BUG: ToolBar do not inherit rules from ViewForm */
+ViewerPane > ToolBar,
+DrillDownComposite > ToolBar,
+GradientCanvas > ToolBar,
+FlyoutControlComposite ToolBar
+{
+ background-color:inherit;
+}
+
Combo, List,
/* It might be useless but currently it's needed due to a strange priority
policy used by the E4 platform to apply CSS rules to SWT widgets (see <1>): */
@@ -244,9 +257,7 @@
}
ViewerPane,
-DrillDownComposite,
-ViewerPane > ToolBar,
-DrillDownComposite > ToolBar {
+DrillDownComposite {
background-color: #232323;
color: #CCC;
}
@@ -287,7 +298,6 @@
}
GradientCanvas,
GradientCanvas > Label,
-GradientCanvas > ToolBar,
GradientCanvas > ImageHyperlink {
background-color: #3f4447;
color: #9ac9d8;
@@ -459,7 +469,7 @@
color: #EEEEEE;
}
-FlyoutControlComposite, FlyoutControlComposite ToolBar, FlyoutControlComposite CLabel {
+FlyoutControlComposite, FlyoutControlComposite CLabel {
background-color: #3f4447;
color: #EEEEEE;
}
