Use `editorGroupHeader.tabsBackground` from VS Code as tab bar background (#3558)

Marshall Bowers created 2 years ago

This PR changes the color we use for the tab bar background from the VS
Code theme to `editorGroupHeader.tabsBackground`.

Release Notes:

- N/A

Change summary

crates/theme2/src/themes/dracula.rs           |  2 
crates/theme2/src/themes/gruvbox.rs           |  6 +++++
crates/theme2/src/themes/noctis.rs            | 22 ++++++++++----------
crates/theme2/src/themes/palenight.rs         |  6 ++--
crates/theme2/src/themes/rose_pine.rs         |  6 ++--
crates/theme2/src/themes/solarized.rs         |  2 +
crates/theme2/src/themes/synthwave_84.rs      |  1 
crates/theme_importer/src/vscode/converter.rs |  2 
8 files changed, 28 insertions(+), 19 deletions(-)

Detailed changes

crates/theme2/src/themes/dracula.rs

@@ -36,7 +36,7 @@ pub fn dracula() -> UserThemeFamily {
                     status_bar_background: Some(rgba(0x191a21ff).into()),
                     title_bar_background: Some(rgba(0x21222cff).into()),
                     toolbar_background: Some(rgba(0x282a36ff).into()),
-                    tab_bar_background: Some(rgba(0x282a36ff).into()),
+                    tab_bar_background: Some(rgba(0x191a21ff).into()),
                     tab_inactive_background: Some(rgba(0x21222cff).into()),
                     tab_active_background: Some(rgba(0x282a36ff).into()),
                     editor_background: Some(rgba(0x282a36ff).into()),

crates/theme2/src/themes/gruvbox.rs

@@ -34,6 +34,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0xebdbb2ff).into()),
                         status_bar_background: Some(rgba(0x1d2021ff).into()),
                         title_bar_background: Some(rgba(0x1d2021ff).into()),
+                        tab_bar_background: Some(rgba(0x1d2021ff).into()),
                         tab_inactive_background: Some(rgba(0x1d2021ff).into()),
                         tab_active_background: Some(rgba(0x32302fff).into()),
                         editor_background: Some(rgba(0x1d2021ff).into()),
@@ -316,6 +317,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0xebdbb2ff).into()),
                         status_bar_background: Some(rgba(0x282828ff).into()),
                         title_bar_background: Some(rgba(0x282828ff).into()),
+                        tab_bar_background: Some(rgba(0x282828ff).into()),
                         tab_inactive_background: Some(rgba(0x282828ff).into()),
                         tab_active_background: Some(rgba(0x3c3836ff).into()),
                         editor_background: Some(rgba(0x282828ff).into()),
@@ -598,6 +600,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0xebdbb2ff).into()),
                         status_bar_background: Some(rgba(0x32302fff).into()),
                         title_bar_background: Some(rgba(0x32302fff).into()),
+                        tab_bar_background: Some(rgba(0x32302fff).into()),
                         tab_inactive_background: Some(rgba(0x32302fff).into()),
                         tab_active_background: Some(rgba(0x504945ff).into()),
                         editor_background: Some(rgba(0x32302fff).into()),
@@ -880,6 +883,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0x3c3836ff).into()),
                         status_bar_background: Some(rgba(0xf9f5d7ff).into()),
                         title_bar_background: Some(rgba(0xf9f5d7ff).into()),
+                        tab_bar_background: Some(rgba(0xf9f5d7ff).into()),
                         tab_inactive_background: Some(rgba(0xf9f5d7ff).into()),
                         tab_active_background: Some(rgba(0xf2e5bcff).into()),
                         editor_background: Some(rgba(0xf9f5d7ff).into()),
@@ -1162,6 +1166,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0x3c3836ff).into()),
                         status_bar_background: Some(rgba(0xfbf1c7ff).into()),
                         title_bar_background: Some(rgba(0xfbf1c7ff).into()),
+                        tab_bar_background: Some(rgba(0xfbf1c7ff).into()),
                         tab_inactive_background: Some(rgba(0xfbf1c7ff).into()),
                         tab_active_background: Some(rgba(0xebdbb2ff).into()),
                         editor_background: Some(rgba(0xfbf1c7ff).into()),
@@ -1444,6 +1449,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0x3c3836ff).into()),
                         status_bar_background: Some(rgba(0xf2e5bcff).into()),
                         title_bar_background: Some(rgba(0xf2e5bcff).into()),
+                        tab_bar_background: Some(rgba(0xf2e5bcff).into()),
                         tab_inactive_background: Some(rgba(0xf2e5bcff).into()),
                         tab_active_background: Some(rgba(0xd5c4a1ff).into()),
                         editor_background: Some(rgba(0xf2e5bcff).into()),

crates/theme2/src/themes/noctis.rs

@@ -37,7 +37,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x07273bff).into()),
                         title_bar_background: Some(rgba(0x07273bff).into()),
                         toolbar_background: Some(rgba(0x051b29ff).into()),
-                        tab_bar_background: Some(rgba(0x051b29ff).into()),
+                        tab_bar_background: Some(rgba(0x09334eff).into()),
                         tab_inactive_background: Some(rgba(0x09334eff).into()),
                         tab_active_background: Some(rgba(0x07273bff).into()),
                         editor_background: Some(rgba(0x07273bff).into()),
@@ -307,7 +307,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x322a2dff).into()),
                         title_bar_background: Some(rgba(0x322a2dff).into()),
                         toolbar_background: Some(rgba(0x272022ff).into()),
-                        tab_bar_background: Some(rgba(0x272022ff).into()),
+                        tab_bar_background: Some(rgba(0x413036ff).into()),
                         tab_inactive_background: Some(rgba(0x413036ff).into()),
                         tab_active_background: Some(rgba(0x322a2dff).into()),
                         editor_background: Some(rgba(0x322a2dff).into()),
@@ -577,7 +577,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0xcaedf2ff).into()),
                         title_bar_background: Some(rgba(0xe7f2f3ff).into()),
                         toolbar_background: Some(rgba(0xe1eeefff).into()),
-                        tab_bar_background: Some(rgba(0xe1eeefff).into()),
+                        tab_bar_background: Some(rgba(0xcaedf2ff).into()),
                         tab_inactive_background: Some(rgba(0xcaedf2ff).into()),
                         tab_active_background: Some(rgba(0xf4f6f6ff).into()),
                         editor_background: Some(rgba(0xf4f6f6ff).into()),
@@ -847,7 +847,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0xe2dff6ff).into()),
                         title_bar_background: Some(rgba(0xedecf8ff).into()),
                         toolbar_background: Some(rgba(0xe9e7f3ff).into()),
-                        tab_bar_background: Some(rgba(0xe9e7f3ff).into()),
+                        tab_bar_background: Some(rgba(0xe2dff6ff).into()),
                         tab_inactive_background: Some(rgba(0xe2dff6ff).into()),
                         tab_active_background: Some(rgba(0xf2f1f8ff).into()),
                         editor_background: Some(rgba(0xf2f1f8ff).into()),
@@ -1117,7 +1117,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0xf0e9d6ff).into()),
                         title_bar_background: Some(rgba(0xf9f1e1ff).into()),
                         toolbar_background: Some(rgba(0xf6eddaff).into()),
-                        tab_bar_background: Some(rgba(0xf6eddaff).into()),
+                        tab_bar_background: Some(rgba(0xf0e9d6ff).into()),
                         tab_inactive_background: Some(rgba(0xf0e9d6ff).into()),
                         tab_active_background: Some(rgba(0xfef8ecff).into()),
                         editor_background: Some(rgba(0xfef8ecff).into()),
@@ -1387,7 +1387,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x1b2932ff).into()),
                         title_bar_background: Some(rgba(0x1b2932ff).into()),
                         toolbar_background: Some(rgba(0x0e1920ff).into()),
-                        tab_bar_background: Some(rgba(0x0e1920ff).into()),
+                        tab_bar_background: Some(rgba(0x24333dff).into()),
                         tab_inactive_background: Some(rgba(0x202e37ff).into()),
                         tab_active_background: Some(rgba(0x1b2932ff).into()),
                         editor_background: Some(rgba(0x1b2932ff).into()),
@@ -1657,7 +1657,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x041d20ff).into()),
                         title_bar_background: Some(rgba(0x041d20ff).into()),
                         toolbar_background: Some(rgba(0x03191bff).into()),
-                        tab_bar_background: Some(rgba(0x03191bff).into()),
+                        tab_bar_background: Some(rgba(0x062e32ff).into()),
                         tab_inactive_background: Some(rgba(0x062e32ff).into()),
                         tab_active_background: Some(rgba(0x052529ff).into()),
                         editor_background: Some(rgba(0x052529ff).into()),
@@ -1927,7 +1927,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x031417ff).into()),
                         title_bar_background: Some(rgba(0x031417ff).into()),
                         toolbar_background: Some(rgba(0x020c0eff).into()),
-                        tab_bar_background: Some(rgba(0x020c0eff).into()),
+                        tab_bar_background: Some(rgba(0x062e32ff).into()),
                         tab_inactive_background: Some(rgba(0x062e32ff).into()),
                         tab_active_background: Some(rgba(0x031417ff).into()),
                         editor_background: Some(rgba(0x031417ff).into()),
@@ -2197,7 +2197,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x031417ff).into()),
                         title_bar_background: Some(rgba(0x031417ff).into()),
                         toolbar_background: Some(rgba(0x020c0eff).into()),
-                        tab_bar_background: Some(rgba(0x020c0eff).into()),
+                        tab_bar_background: Some(rgba(0x062e32ff).into()),
                         tab_inactive_background: Some(rgba(0x062e32ff).into()),
                         tab_active_background: Some(rgba(0x031417ff).into()),
                         editor_background: Some(rgba(0x031417ff).into()),
@@ -2467,7 +2467,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x292640ff).into()),
                         title_bar_background: Some(rgba(0x292640ff).into()),
                         toolbar_background: Some(rgba(0x1f1d30ff).into()),
-                        tab_bar_background: Some(rgba(0x1f1d30ff).into()),
+                        tab_bar_background: Some(rgba(0x2f2c49ff).into()),
                         tab_inactive_background: Some(rgba(0x2f2c49ff).into()),
                         tab_active_background: Some(rgba(0x292640ff).into()),
                         editor_background: Some(rgba(0x292640ff).into()),
@@ -2737,7 +2737,7 @@ pub fn noctis() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x30243dff).into()),
                         title_bar_background: Some(rgba(0x30243dff).into()),
                         toolbar_background: Some(rgba(0x291d35ff).into()),
-                        tab_bar_background: Some(rgba(0x291d35ff).into()),
+                        tab_bar_background: Some(rgba(0x3d2e4dff).into()),
                         tab_inactive_background: Some(rgba(0x3d2e4dff).into()),
                         tab_active_background: Some(rgba(0x30243dff).into()),
                         editor_background: Some(rgba(0x30243dff).into()),

crates/theme2/src/themes/palenight.rs

@@ -37,7 +37,7 @@ pub fn palenight() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x282c3dff).into()),
                         title_bar_background: Some(rgba(0x292d3eff).into()),
                         toolbar_background: Some(rgba(0x292d3eff).into()),
-                        tab_bar_background: Some(rgba(0x292d3eff).into()),
+                        tab_bar_background: Some(rgba(0x31364aff).into()),
                         tab_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x292d3eff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
@@ -316,7 +316,7 @@ pub fn palenight() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x282c3dff).into()),
                         title_bar_background: Some(rgba(0x292d3eff).into()),
                         toolbar_background: Some(rgba(0x292d3eff).into()),
-                        tab_bar_background: Some(rgba(0x292d3eff).into()),
+                        tab_bar_background: Some(rgba(0x31364aff).into()),
                         tab_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x292d3eff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
@@ -595,7 +595,7 @@ pub fn palenight() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x25293aff).into()),
                         title_bar_background: Some(rgba(0x25293aff).into()),
                         toolbar_background: Some(rgba(0x25293aff).into()),
-                        tab_bar_background: Some(rgba(0x25293aff).into()),
+                        tab_bar_background: Some(rgba(0x31364aff).into()),
                         tab_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x25293aff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),

crates/theme2/src/themes/rose_pine.rs

@@ -37,7 +37,7 @@ pub fn rose_pine() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x191724ff).into()),
                         title_bar_background: Some(rgba(0x191724ff).into()),
                         toolbar_background: Some(rgba(0x1f1d2eff).into()),
-                        tab_bar_background: Some(rgba(0x1f1d2eff).into()),
+                        tab_bar_background: Some(rgba(0x00000000).into()),
                         tab_inactive_background: Some(rgba(0x00000000).into()),
                         tab_active_background: Some(rgba(0x6e6a861a).into()),
                         editor_background: Some(rgba(0x191724ff).into()),
@@ -288,7 +288,7 @@ pub fn rose_pine() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0x232136ff).into()),
                         title_bar_background: Some(rgba(0x232136ff).into()),
                         toolbar_background: Some(rgba(0x2a273fff).into()),
-                        tab_bar_background: Some(rgba(0x2a273fff).into()),
+                        tab_bar_background: Some(rgba(0x00000000).into()),
                         tab_inactive_background: Some(rgba(0x00000000).into()),
                         tab_active_background: Some(rgba(0x817c9c14).into()),
                         editor_background: Some(rgba(0x232136ff).into()),
@@ -539,7 +539,7 @@ pub fn rose_pine() -> UserThemeFamily {
                         status_bar_background: Some(rgba(0xfaf4edff).into()),
                         title_bar_background: Some(rgba(0xfaf4edff).into()),
                         toolbar_background: Some(rgba(0xfffaf3ff).into()),
-                        tab_bar_background: Some(rgba(0xfffaf3ff).into()),
+                        tab_bar_background: Some(rgba(0x00000000).into()),
                         tab_inactive_background: Some(rgba(0x00000000).into()),
                         tab_active_background: Some(rgba(0x6e6a860d).into()),
                         editor_background: Some(rgba(0xfaf4edff).into()),

crates/theme2/src/themes/solarized.rs

@@ -34,6 +34,7 @@ pub fn solarized() -> UserThemeFamily {
                         text: Some(rgba(0xbbbbbbff).into()),
                         status_bar_background: Some(rgba(0x00212bff).into()),
                         title_bar_background: Some(rgba(0x002c39ff).into()),
+                        tab_bar_background: Some(rgba(0x004052ff).into()),
                         tab_inactive_background: Some(rgba(0x004052ff).into()),
                         tab_active_background: Some(rgba(0x002b37ff).into()),
                         editor_background: Some(rgba(0x002b36ff).into()),
@@ -294,6 +295,7 @@ pub fn solarized() -> UserThemeFamily {
                         text: Some(rgba(0x333333ff).into()),
                         status_bar_background: Some(rgba(0xeee8d5ff).into()),
                         title_bar_background: Some(rgba(0xeee8d5ff).into()),
+                        tab_bar_background: Some(rgba(0xd9d2c2ff).into()),
                         tab_inactive_background: Some(rgba(0xd3cbb7ff).into()),
                         tab_active_background: Some(rgba(0xfdf6e3ff).into()),
                         editor_background: Some(rgba(0xfdf6e3ff).into()),

crates/theme2/src/themes/synthwave_84.rs

@@ -28,6 +28,7 @@ pub fn synthwave_84() -> UserThemeFamily {
                     text: Some(rgba(0xffffffff).into()),
                     status_bar_background: Some(rgba(0x241b2fff).into()),
                     title_bar_background: Some(rgba(0x241b2fff).into()),
+                    tab_bar_background: Some(rgba(0x241b2fff).into()),
                     tab_inactive_background: Some(rgba(0x262335ff).into()),
                     editor_background: Some(rgba(0x262335ff).into()),
                     editor_gutter_background: Some(rgba(0x262335ff).into()),

crates/theme_importer/src/vscode/converter.rs

@@ -202,7 +202,7 @@ impl VsCodeThemeConverter {
                         .flatten()
                 }),
             tab_bar_background: vscode_colors
-                .panel_background
+                .editor_group_header_tabs_background
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
             tab_active_background: vscode_colors