Set tab bar and toolbar backgrounds

Marshall Bowers created 2 years ago

Change summary

crates/theme2/src/themes/andromeda.rs         |  4 +++
crates/theme2/src/themes/ayu.rs               |  6 +++++
crates/theme2/src/themes/dracula.rs           |  2 +
crates/theme2/src/themes/night_owl.rs         |  4 +++
crates/theme2/src/themes/noctis.rs            | 22 +++++++++++++++++++++
crates/theme2/src/themes/nord.rs              |  2 +
crates/theme2/src/themes/palenight.rs         |  6 +++++
crates/theme2/src/themes/rose_pine.rs         |  6 +++++
crates/theme_importer/src/vscode/converter.rs |  8 +++++++
9 files changed, 60 insertions(+)

Detailed changes

crates/theme2/src/themes/andromeda.rs

@@ -36,6 +36,8 @@ pub fn andromeda() -> UserThemeFamily {
                         text: Some(rgba(0xd5ced9ff).into()),
                         status_bar_background: Some(rgba(0x23262eff).into()),
                         title_bar_background: Some(rgba(0x23262eff).into()),
+                        toolbar_background: Some(rgba(0x23262eff).into()),
+                        tab_bar_background: Some(rgba(0x23262eff).into()),
                         tab_inactive_background: Some(rgba(0x23262eff).into()),
                         tab_active_background: Some(rgba(0x23262eff).into()),
                         editor_background: Some(rgba(0x23262eff).into()),
@@ -196,6 +198,8 @@ pub fn andromeda() -> UserThemeFamily {
                         text: Some(rgba(0xd5ced9ff).into()),
                         status_bar_background: Some(rgba(0x23262eff).into()),
                         title_bar_background: Some(rgba(0x23262eff).into()),
+                        toolbar_background: Some(rgba(0x23262eff).into()),
+                        tab_bar_background: Some(rgba(0x23262eff).into()),
                         tab_inactive_background: Some(rgba(0x23262eff).into()),
                         tab_active_background: Some(rgba(0x262a33ff).into()),
                         editor_background: Some(rgba(0x262a33ff).into()),

crates/theme2/src/themes/ayu.rs

@@ -35,6 +35,8 @@ pub fn ayu() -> UserThemeFamily {
                         text: Some(rgba(0x8a9199ff).into()),
                         status_bar_background: Some(rgba(0xf8f9faff).into()),
                         title_bar_background: Some(rgba(0xf8f9faff).into()),
+                        toolbar_background: Some(rgba(0xf8f9faff).into()),
+                        tab_bar_background: Some(rgba(0xf8f9faff).into()),
                         tab_inactive_background: Some(rgba(0xf8f9faff).into()),
                         tab_active_background: Some(rgba(0xf8f9faff).into()),
                         editor_background: Some(rgba(0xf8f9faff).into()),
@@ -308,6 +310,8 @@ pub fn ayu() -> UserThemeFamily {
                         text: Some(rgba(0x707a8cff).into()),
                         status_bar_background: Some(rgba(0x1f2430ff).into()),
                         title_bar_background: Some(rgba(0x1f2430ff).into()),
+                        toolbar_background: Some(rgba(0x1f2430ff).into()),
+                        tab_bar_background: Some(rgba(0x1f2430ff).into()),
                         tab_inactive_background: Some(rgba(0x1f2430ff).into()),
                         tab_active_background: Some(rgba(0x1f2430ff).into()),
                         editor_background: Some(rgba(0x1f2430ff).into()),
@@ -581,6 +585,8 @@ pub fn ayu() -> UserThemeFamily {
                         text: Some(rgba(0x565b66ff).into()),
                         status_bar_background: Some(rgba(0x0b0e14ff).into()),
                         title_bar_background: Some(rgba(0x0b0e14ff).into()),
+                        toolbar_background: Some(rgba(0x0b0e14ff).into()),
+                        tab_bar_background: Some(rgba(0x0b0e14ff).into()),
                         tab_inactive_background: Some(rgba(0x0b0e14ff).into()),
                         tab_active_background: Some(rgba(0x0b0e14ff).into()),
                         editor_background: Some(rgba(0x0b0e14ff).into()),

crates/theme2/src/themes/dracula.rs

@@ -35,6 +35,8 @@ pub fn dracula() -> UserThemeFamily {
                     text: Some(rgba(0xf8f8f2ff).into()),
                     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_inactive_background: Some(rgba(0x21222cff).into()),
                     tab_active_background: Some(rgba(0x282a36ff).into()),
                     editor_background: Some(rgba(0x282a36ff).into()),

crates/theme2/src/themes/night_owl.rs

@@ -36,6 +36,8 @@ pub fn night_owl() -> UserThemeFamily {
                         text: Some(rgba(0xd6deebff).into()),
                         status_bar_background: Some(rgba(0x011627ff).into()),
                         title_bar_background: Some(rgba(0x011627ff).into()),
+                        toolbar_background: Some(rgba(0x011627ff).into()),
+                        tab_bar_background: Some(rgba(0x011627ff).into()),
                         tab_inactive_background: Some(rgba(0x01111dff).into()),
                         tab_active_background: Some(rgba(0x0b2942ff).into()),
                         editor_background: Some(rgba(0x011627ff).into()),
@@ -224,6 +226,8 @@ pub fn night_owl() -> UserThemeFamily {
                         text: Some(rgba(0x403f53ff).into()),
                         status_bar_background: Some(rgba(0xf0f0f0ff).into()),
                         title_bar_background: Some(rgba(0xf0f0f0ff).into()),
+                        toolbar_background: Some(rgba(0xf0f0f0ff).into()),
+                        tab_bar_background: Some(rgba(0xf0f0f0ff).into()),
                         tab_inactive_background: Some(rgba(0xf0f0f0ff).into()),
                         tab_active_background: Some(rgba(0xf6f6f6ff).into()),
                         editor_background: Some(rgba(0xfbfbfbff).into()),

crates/theme2/src/themes/noctis.rs

@@ -36,6 +36,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xbecfdaff).into()),
                         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_inactive_background: Some(rgba(0x09334eff).into()),
                         tab_active_background: Some(rgba(0x07273bff).into()),
                         editor_background: Some(rgba(0x07273bff).into()),
@@ -244,6 +246,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xcbbec2ff).into()),
                         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_inactive_background: Some(rgba(0x413036ff).into()),
                         tab_active_background: Some(rgba(0x322a2dff).into()),
                         editor_background: Some(rgba(0x322a2dff).into()),
@@ -452,6 +456,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0x005661ff).into()),
                         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_inactive_background: Some(rgba(0xcaedf2ff).into()),
                         tab_active_background: Some(rgba(0xf4f6f6ff).into()),
                         editor_background: Some(rgba(0xf4f6f6ff).into()),
@@ -660,6 +666,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0x0c006bff).into()),
                         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_inactive_background: Some(rgba(0xe2dff6ff).into()),
                         tab_active_background: Some(rgba(0xf2f1f8ff).into()),
                         editor_background: Some(rgba(0xf2f1f8ff).into()),
@@ -868,6 +876,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0x005661ff).into()),
                         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_inactive_background: Some(rgba(0xf0e9d6ff).into()),
                         tab_active_background: Some(rgba(0xfef8ecff).into()),
                         editor_background: Some(rgba(0xfef8ecff).into()),
@@ -1076,6 +1086,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xc5cdd3ff).into()),
                         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_inactive_background: Some(rgba(0x202e37ff).into()),
                         tab_active_background: Some(rgba(0x1b2932ff).into()),
                         editor_background: Some(rgba(0x1b2932ff).into()),
@@ -1284,6 +1296,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xb2cacdff).into()),
                         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_inactive_background: Some(rgba(0x062e32ff).into()),
                         tab_active_background: Some(rgba(0x052529ff).into()),
                         editor_background: Some(rgba(0x052529ff).into()),
@@ -1492,6 +1506,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xb2cacdff).into()),
                         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_inactive_background: Some(rgba(0x062e32ff).into()),
                         tab_active_background: Some(rgba(0x031417ff).into()),
                         editor_background: Some(rgba(0x031417ff).into()),
@@ -1700,6 +1716,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xb2cacdff).into()),
                         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_inactive_background: Some(rgba(0x062e32ff).into()),
                         tab_active_background: Some(rgba(0x031417ff).into()),
                         editor_background: Some(rgba(0x031417ff).into()),
@@ -1908,6 +1926,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xc5c2d6ff).into()),
                         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_inactive_background: Some(rgba(0x2f2c49ff).into()),
                         tab_active_background: Some(rgba(0x292640ff).into()),
                         editor_background: Some(rgba(0x292640ff).into()),
@@ -2116,6 +2136,8 @@ pub fn noctis() -> UserThemeFamily {
                         text: Some(rgba(0xccbfd9ff).into()),
                         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_inactive_background: Some(rgba(0x3d2e4dff).into()),
                         tab_active_background: Some(rgba(0x30243dff).into()),
                         editor_background: Some(rgba(0x30243dff).into()),

crates/theme2/src/themes/nord.rs

@@ -35,6 +35,8 @@ pub fn nord() -> UserThemeFamily {
                     text: Some(rgba(0xd8dee9ff).into()),
                     status_bar_background: Some(rgba(0x3b4252ff).into()),
                     title_bar_background: Some(rgba(0x2e3440ff).into()),
+                    toolbar_background: Some(rgba(0x2e3440ff).into()),
+                    tab_bar_background: Some(rgba(0x2e3440ff).into()),
                     tab_inactive_background: Some(rgba(0x2e3440ff).into()),
                     tab_active_background: Some(rgba(0x3b4252ff).into()),
                     editor_background: Some(rgba(0x2e3440ff).into()),

crates/theme2/src/themes/palenight.rs

@@ -36,6 +36,8 @@ pub fn palenight() -> UserThemeFamily {
                         text: Some(rgba(0xffffffff).into()),
                         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_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x292d3eff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
@@ -253,6 +255,8 @@ pub fn palenight() -> UserThemeFamily {
                         text: Some(rgba(0xffffffff).into()),
                         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_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x292d3eff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
@@ -470,6 +474,8 @@ pub fn palenight() -> UserThemeFamily {
                         text: Some(rgba(0xffffffff).into()),
                         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_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

@@ -36,6 +36,8 @@ pub fn rose_pine() -> UserThemeFamily {
                         text: Some(rgba(0xe0def4ff).into()),
                         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_inactive_background: Some(rgba(0x000000ff).into()),
                         tab_active_background: Some(rgba(0x6e6a861a).into()),
                         editor_background: Some(rgba(0x191724ff).into()),
@@ -211,6 +213,8 @@ pub fn rose_pine() -> UserThemeFamily {
                         text: Some(rgba(0xe0def4ff).into()),
                         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_inactive_background: Some(rgba(0x000000ff).into()),
                         tab_active_background: Some(rgba(0x817c9c14).into()),
                         editor_background: Some(rgba(0x232136ff).into()),
@@ -386,6 +390,8 @@ pub fn rose_pine() -> UserThemeFamily {
                         text: Some(rgba(0x575279ff).into()),
                         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_inactive_background: Some(rgba(0x000000ff).into()),
                         tab_active_background: Some(rgba(0x6e6a860d).into()),
                         editor_background: Some(rgba(0xfaf4edff).into()),

crates/theme_importer/src/vscode/converter.rs

@@ -183,6 +183,10 @@ impl VsCodeThemeConverter {
                         .ok()
                         .flatten()
                 }),
+            tab_bar_background: vscode_colors
+                .panel_background
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
             tab_active_background: vscode_colors
                 .tab_active_background
                 .as_ref()
@@ -191,6 +195,10 @@ impl VsCodeThemeConverter {
                 .tab_inactive_background
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
+            toolbar_background: vscode_colors
+                .panel_background
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
             editor_background: vscode_colors
                 .editor_background
                 .as_ref()