[Dark Theme] Fix for highlight issue in sub-tabs

Selected sub-tabs in editor and views were missing blue highlight with the dark theme changes. This has been fixed with this change.
eclipse-platform · Jan 3, 2025 · 6db4ad4 · 6db4ad4
1 parent 8fd556c
commit 6db4ad4
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 40 deletions.
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css
@@ -40,12 +40,11 @@ CTabFolder {
 CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
     /* Set the styles for the bottom inner tabs (Bug 430051): */
     swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
-    swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
     swt-selected-tab-highlight: #316c9b;
     swt-selected-highlight-top: false;
 }
 
-
 CTabFolder.active {
     swt-selected-tab-highlight: #316c9b;
     swt-selected-highlight-top: false;

diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
@@ -80,14 +80,28 @@ ImageBasedFrame,
     swt-selected-highlight-top: false;
 }
 
+.MPartStack CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
+    swt-selected-tab-highlight: #a6a6a6;
+    swt-selected-highlight-top: true;
+}
+.MPartStack.active CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
+    swt-selected-tab-highlight: #2b97d7;
+    swt-selected-highlight-top: true;
+}
+
 /*text color of selected tab in editor */
 #org-eclipse-ui-editorss CTabItem:selected{
 	color: '#FFFFFF';
 }
 
 #org-eclipse-ui-editorss CTabFolder{
  	swt-selected-tab-fill : '#1E1F22';
-swt-selected-tab-highlight: '#a6a6a6';
     swt-selected-highlight-top: true;
     swt-draw-custom-tab-content-background: true;
 	swt-unselected-hot-tab-color-background:#161616;		
@@ -98,19 +112,9 @@ swt-selected-tab-highlight: '#a6a6a6';
     swt-selected-highlight-top: true;
 }
 
-CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
-    /* Set the styles for the bottom inner tabs (Bug 430051): */
-    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
-    swt-selected-tab-fill: #1E1F22;
-    swt-unselected-tabs-color: #48484c;
-    swt-unselected-hot-tab-color-background: #2f2f2f;
-    swt-selected-tab-highlight: #2b79d7;
-    swt-selected-highlight-top: false;
-}
-
 .Editor Form Composite,
 .Editor Form Composite Tree,
 .MPartStack.active .Editor Form Composite Tree
 {
 	background-color: #1E1F22;
-}
+}
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
@@ -66,14 +66,28 @@ Button  {
     swt-selected-highlight-top: false;
 }
 
+.MPartStack CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
+    swt-selected-tab-highlight: #a6a6a6;
+    swt-selected-highlight-top: true;
+}
+.MPartStack.active CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
+    swt-selected-tab-highlight: #2b97d7;
+    swt-selected-highlight-top: true;
+}
+
 /*text color of selected tab in editor */
 #org-eclipse-ui-editorss CTabItem:selected{
 	color: '#FFFFFF';
 }
 
 #org-eclipse-ui-editorss CTabFolder{
  	swt-selected-tab-fill : '#1E1F22';
-	swt-selected-tab-highlight: '#a6a6a6';
     swt-selected-highlight-top: true;
     swt-draw-custom-tab-content-background: true;
 	swt-unselected-hot-tab-color-background:#161616;	
@@ -84,20 +98,9 @@ Button  {
     swt-selected-highlight-top: true;
 }
 
-CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
-    /* Set the styles for the bottom inner tabs (Bug 430051): */
-    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
-    swt-selected-tab-fill: #1E1F22;
-    swt-unselected-tabs-color: #48484c;
-    swt-unselected-hot-tab-color-background: #2f2f2f;
-    swt-selected-tab-highlight: #2b79d7;
-    swt-selected-highlight-top: false;
-}
-
 .Editor Form Composite,
 .Editor Form Composite Tree,
 .MPartStack.active .Editor Form Composite Tree
 {
 	background-color: #1E1F22;
-}
-
+}
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
@@ -148,33 +148,37 @@ ImageBasedFrame,
     swt-selected-highlight-top: false;
 }
 
+.MPartStack CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
+    swt-selected-tab-highlight: #a6a6a6;
+    swt-selected-highlight-top: true;
+}
+.MPartStack.active CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616;/*  Bug 465711 */
+    swt-selected-tab-highlight: #2b97d7;
+    swt-selected-highlight-top: true;
+}
+
 /*text color of selected tab in editor */
 #org-eclipse-ui-editorss CTabItem:selected{
 	color: '#FFFFFF';
 }
 
 #org-eclipse-ui-editorss CTabFolder{
  	swt-selected-tab-fill : '#1E1F22';
-	swt-selected-tab-highlight: '#a6a6a6';
     swt-selected-highlight-top: true;
     swt-draw-custom-tab-content-background: true;
-	swt-unselected-hot-tab-color-background:#161616;	
+	swt-unselected-hot-tab-color-background:#161616;
 }
 
 #org-eclipse-ui-editorss CTabFolder.active {
     swt-selected-tab-highlight: '#2b79d7';
     swt-selected-highlight-top: true;
-}
-
-CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
-    /* Set the styles for the bottom inner tabs (Bug 430051): */
-    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
-    swt-selected-tab-fill: #1E1F22;
-    swt-unselected-tabs-color: #48484c;
-    swt-unselected-hot-tab-color-background: #2f2f2f;
-    swt-selected-tab-highlight: #2b79d7;
-    swt-selected-highlight-top: false;
-}
+} 
 
 .Editor Form Composite,
 .Editor Form Composite Tree,