From aa27e1bcece75cd5087b3d64d5597aea09cd46aa Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 11 Dec 2023 16:39:00 -0500 Subject: [PATCH 1/3] Draw the scrollbar track left border --- crates/editor2/src/element.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/editor2/src/element.rs b/crates/editor2/src/element.rs index d881e8ff4c38a0d5ed971f66a6dcb8a6ee79d718..b77699b20e2f05b41787480ba8bc8fd8f4785dee 100644 --- a/crates/editor2/src/element.rs +++ b/crates/editor2/src/element.rs @@ -1282,7 +1282,12 @@ impl EditorElement { track_bounds, Corners::default(), cx.theme().colors().scrollbar_track_background, - Edges::default(), // todo!("style.track.border") + Edges { + top: Pixels::ZERO, + right: Pixels::ZERO, + bottom: Pixels::ZERO, + left: px(1.), + }, cx.theme().colors().scrollbar_track_border, ); let scrollbar_settings = EditorSettings::get_global(cx).scrollbar; From dfd1b5aa11193402922092d857c32ba96dca0353 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 11 Dec 2023 16:39:26 -0500 Subject: [PATCH 2/3] Use the editor background for the scrollbar track background --- crates/theme2/src/themes/andromeda.rs | 2 +- crates/theme2/src/themes/ayu.rs | 6 +-- crates/theme2/src/themes/dracula.rs | 1 + 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/theme2/src/themes/solarized.rs | 2 + crates/theme2/src/themes/synthwave_84.rs | 2 +- crates/theme_importer/src/vscode/converter.rs | 40 +++++++------------ crates/theme_importer/src/vscode/theme.rs | 7 ++++ 12 files changed, 49 insertions(+), 51 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 7a6c51409d235b7c99ebc368d8bc8bf9cb4d97f9..a2de85aa82378bebb7738b41502435f879e483a7 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -259,7 +259,7 @@ pub fn andromeda() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x3a3f4c77).into()), scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()), scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()), - scrollbar_track_background: Some(rgba(0x23262eff).into()), + scrollbar_track_background: Some(rgba(0x262a33ff).into()), scrollbar_track_border: Some(rgba(0x23262eff).into()), editor_background: Some(rgba(0x262a33ff).into()), editor_gutter_background: Some(rgba(0x262a33ff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 9f462b25537e2d86299be23870a5e1809509f75d..65932e7cdafc26faf86117731f46af2ba8ad8354 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -44,7 +44,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x8a919966).into()), scrollbar_thumb_hover_background: Some(rgba(0x8a919999).into()), scrollbar_thumb_border: Some(rgba(0x8a919966).into()), - scrollbar_track_background: Some(rgba(0x6b7d8f00).into()), + scrollbar_track_background: Some(rgba(0xf8f9faff).into()), scrollbar_track_border: Some(rgba(0x6b7d8f00).into()), editor_background: Some(rgba(0xf8f9faff).into()), editor_gutter_background: Some(rgba(0xf8f9faff).into()), @@ -350,7 +350,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x707a8c66).into()), scrollbar_thumb_hover_background: Some(rgba(0x707a8c99).into()), scrollbar_thumb_border: Some(rgba(0x707a8c66).into()), - scrollbar_track_background: Some(rgba(0x171b2400).into()), + scrollbar_track_background: Some(rgba(0x1f2430ff).into()), scrollbar_track_border: Some(rgba(0x171b2400).into()), editor_background: Some(rgba(0x1f2430ff).into()), editor_gutter_background: Some(rgba(0x1f2430ff).into()), @@ -656,7 +656,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x565b6666).into()), scrollbar_thumb_hover_background: Some(rgba(0x565b6699).into()), scrollbar_thumb_border: Some(rgba(0x565b6666).into()), - scrollbar_track_background: Some(rgba(0x1e232b00).into()), + scrollbar_track_background: Some(rgba(0x0b0e14ff).into()), scrollbar_track_border: Some(rgba(0x1e232b00).into()), editor_background: Some(rgba(0x0b0e14ff).into()), editor_gutter_background: Some(rgba(0x0b0e14ff).into()), diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index c7ae83b92caf51065851a3608c7b0a739db8e1b9..54f29461691009ec86a09c58077d0608fe73f63c 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -41,6 +41,7 @@ pub fn dracula() -> UserThemeFamily { tab_bar_background: Some(rgba(0x191a21ff).into()), tab_inactive_background: Some(rgba(0x21222cff).into()), tab_active_background: Some(rgba(0x282a36ff).into()), + scrollbar_track_background: Some(rgba(0x282a36ff).into()), editor_background: Some(rgba(0x282a36ff).into()), editor_gutter_background: Some(rgba(0x282a36ff).into()), editor_line_number: Some(rgba(0x6272a4ff).into()), diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index ac5812ce347af87531a03bb4da2e84ecb7dba5ef..e680b39554f3c77a33e46d6997f937d27c2c97e1 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -45,7 +45,7 @@ pub fn night_owl() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x084d8180).into()), scrollbar_thumb_hover_background: Some(rgba(0x084d8180).into()), scrollbar_thumb_border: Some(rgba(0x084d8180).into()), - scrollbar_track_background: Some(rgba(0x010b14ff).into()), + scrollbar_track_background: Some(rgba(0x011627ff).into()), scrollbar_track_border: Some(rgba(0x010b14ff).into()), editor_background: Some(rgba(0x011627ff).into()), editor_gutter_background: Some(rgba(0x011627ff).into()), @@ -305,7 +305,7 @@ pub fn night_owl() -> UserThemeFamily { tab_bar_background: Some(rgba(0xf0f0f0ff).into()), tab_inactive_background: Some(rgba(0xf0f0f0ff).into()), tab_active_background: Some(rgba(0xf6f6f6ff).into()), - scrollbar_track_background: Some(rgba(0xccccccff).into()), + scrollbar_track_background: Some(rgba(0xfbfbfbff).into()), scrollbar_track_border: Some(rgba(0xccccccff).into()), editor_background: Some(rgba(0xfbfbfbff).into()), editor_gutter_background: Some(rgba(0xfbfbfbff).into()), diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index 65695b5d23ded67ee6e9aa6d20bf02b0cb6308ab..974809054447488647778b17472fbcd60c7c4e8b 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -45,7 +45,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x008ee633).into()), scrollbar_thumb_hover_background: Some(rgba(0x008ee655).into()), scrollbar_thumb_border: Some(rgba(0x008ee633).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x07273bff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x07273bff).into()), editor_gutter_background: Some(rgba(0x07273bff).into()), @@ -322,7 +322,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xeb609133).into()), scrollbar_thumb_hover_background: Some(rgba(0xeb609144).into()), scrollbar_thumb_border: Some(rgba(0xeb609133).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x322a2dff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x322a2dff).into()), editor_gutter_background: Some(rgba(0x322a2dff).into()), @@ -599,7 +599,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6a90955b).into()), scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), - scrollbar_track_background: Some(rgba(0x00000055).into()), + scrollbar_track_background: Some(rgba(0xf4f6f6ff).into()), scrollbar_track_border: Some(rgba(0x00000055).into()), editor_background: Some(rgba(0xf4f6f6ff).into()), editor_gutter_background: Some(rgba(0xf4f6f6ff).into()), @@ -876,7 +876,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6a90955b).into()), scrollbar_thumb_hover_background: Some(rgba(0x7060eb62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), - scrollbar_track_background: Some(rgba(0x00000055).into()), + scrollbar_track_background: Some(rgba(0xf2f1f8ff).into()), scrollbar_track_border: Some(rgba(0x00000055).into()), editor_background: Some(rgba(0xf2f1f8ff).into()), editor_gutter_background: Some(rgba(0xf2f1f8ff).into()), @@ -1153,7 +1153,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6a90955b).into()), scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), - scrollbar_track_background: Some(rgba(0x00000055).into()), + scrollbar_track_background: Some(rgba(0xfef8ecff).into()), scrollbar_track_border: Some(rgba(0x00000055).into()), editor_background: Some(rgba(0xfef8ecff).into()), editor_gutter_background: Some(rgba(0xfef8ecff).into()), @@ -1430,7 +1430,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x3f7fa633).into()), scrollbar_thumb_hover_background: Some(rgba(0x3f7fa655).into()), scrollbar_thumb_border: Some(rgba(0x3f7fa633).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x1b2932ff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x1b2932ff).into()), editor_gutter_background: Some(rgba(0x1b2932ff).into()), @@ -1707,7 +1707,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6a90955b).into()), scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x052529ff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x052529ff).into()), editor_gutter_background: Some(rgba(0x052529ff).into()), @@ -1984,7 +1984,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6a90955b).into()), scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x031417ff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), @@ -2261,7 +2261,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6a90955b).into()), scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x031417ff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), @@ -2538,7 +2538,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x7060eb33).into()), scrollbar_thumb_hover_background: Some(rgba(0x7060eb55).into()), scrollbar_thumb_border: Some(rgba(0x7060eb33).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x292640ff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x292640ff).into()), editor_gutter_background: Some(rgba(0x292640ff).into()), @@ -2815,7 +2815,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0xa660eb33).into()), scrollbar_thumb_hover_background: Some(rgba(0xa660eb55).into()), scrollbar_thumb_border: Some(rgba(0xa660eb33).into()), - scrollbar_track_background: Some(rgba(0x00000044).into()), + scrollbar_track_background: Some(rgba(0x30243dff).into()), scrollbar_track_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x30243dff).into()), editor_gutter_background: Some(rgba(0x30243dff).into()), diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index af3f0da1b5fdc2c2801f6ea462a75a5855dd5340..ceb57ff4df632733a9d7a24a590b5946c4aa844a 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -44,7 +44,7 @@ pub fn nord() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x434c5e99).into()), scrollbar_thumb_hover_background: Some(rgba(0x434c5eaa).into()), scrollbar_thumb_border: Some(rgba(0x434c5e99).into()), - scrollbar_track_background: Some(rgba(0x00000066).into()), + scrollbar_track_background: Some(rgba(0x2e3440ff).into()), scrollbar_track_border: Some(rgba(0x00000066).into()), editor_background: Some(rgba(0x2e3440ff).into()), editor_gutter_background: Some(rgba(0x2e3440ff).into()), diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index bd3e80a1128b79d77e6a3b944b3bb705a376d8a9..fbf1f50def1b02417685cd42834c5d93ade4ff28 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -45,7 +45,7 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x694ca466).into()), scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), - scrollbar_track_background: Some(rgba(0x292d3e00).into()), + scrollbar_track_background: Some(rgba(0x292d3eff).into()), scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), @@ -331,7 +331,7 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x694ca466).into()), scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), - scrollbar_track_background: Some(rgba(0x292d3e00).into()), + scrollbar_track_background: Some(rgba(0x292d3eff).into()), scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), @@ -617,7 +617,7 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x694ca466).into()), scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), - scrollbar_track_background: Some(rgba(0x292d3e00).into()), + scrollbar_track_background: Some(rgba(0x292d3eff).into()), scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index ec2a66f7b12ec29e5a99be252d5c15d25fbd01b4..29cb2030adf122ca4acebdb1f56ea06d95122b53 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -45,7 +45,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6e6a8633).into()), scrollbar_thumb_hover_background: Some(rgba(0x6e6a8666).into()), scrollbar_thumb_border: Some(rgba(0x6e6a8633).into()), - scrollbar_track_background: Some(rgba(0x1f1d2e4d).into()), + scrollbar_track_background: Some(rgba(0x191724ff).into()), scrollbar_track_border: Some(rgba(0x1f1d2e4d).into()), editor_background: Some(rgba(0x191724ff).into()), editor_gutter_background: Some(rgba(0x191724ff).into()), @@ -304,7 +304,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x817c9c26).into()), scrollbar_thumb_hover_background: Some(rgba(0x817c9c4d).into()), scrollbar_thumb_border: Some(rgba(0x817c9c26).into()), - scrollbar_track_background: Some(rgba(0x2a273f4d).into()), + scrollbar_track_background: Some(rgba(0x232136ff).into()), scrollbar_track_border: Some(rgba(0x2a273f4d).into()), editor_background: Some(rgba(0x232136ff).into()), editor_gutter_background: Some(rgba(0x232136ff).into()), @@ -563,7 +563,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x6e6a8614).into()), scrollbar_thumb_hover_background: Some(rgba(0x6e6a8626).into()), scrollbar_thumb_border: Some(rgba(0x6e6a8614).into()), - scrollbar_track_background: Some(rgba(0xfffaf34d).into()), + scrollbar_track_background: Some(rgba(0xfaf4edff).into()), scrollbar_track_border: Some(rgba(0xfffaf34d).into()), editor_background: Some(rgba(0xfaf4edff).into()), editor_gutter_background: Some(rgba(0xfaf4edff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 2772570abfbd1655dd6c237be7f4f45a32a30209..25799bea280e0c4f00becefdfcda76b0b4b49ff3 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -41,6 +41,7 @@ pub fn solarized() -> UserThemeFamily { tab_bar_background: Some(rgba(0x004052ff).into()), tab_inactive_background: Some(rgba(0x004052ff).into()), tab_active_background: Some(rgba(0x002b37ff).into()), + scrollbar_track_background: Some(rgba(0x002b36ff).into()), editor_background: Some(rgba(0x002b36ff).into()), editor_gutter_background: Some(rgba(0x002b36ff).into()), editor_line_number: Some(rgba(0x566c74ff).into()), @@ -305,6 +306,7 @@ pub fn solarized() -> UserThemeFamily { tab_bar_background: Some(rgba(0xd9d2c2ff).into()), tab_inactive_background: Some(rgba(0xd3cbb7ff).into()), tab_active_background: Some(rgba(0xfdf6e3ff).into()), + scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()), editor_background: Some(rgba(0xfdf6e3ff).into()), editor_gutter_background: Some(rgba(0xfdf6e3ff).into()), editor_line_number: Some(rgba(0x9ca8a6ff).into()), diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index df449f6c50b4e48d963ac0ac1f7626be2ee9ffd5..f460d75816346c8f024bf152d512df524daac4b2 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -36,7 +36,7 @@ pub fn synthwave_84() -> UserThemeFamily { scrollbar_thumb_background: Some(rgba(0x9d8bca30).into()), scrollbar_thumb_hover_background: Some(rgba(0x9d8bca50).into()), scrollbar_thumb_border: Some(rgba(0x9d8bca30).into()), - scrollbar_track_background: Some(rgba(0x2a2139ff).into()), + scrollbar_track_background: Some(rgba(0x262335ff).into()), scrollbar_track_border: Some(rgba(0x2a2139ff).into()), editor_background: Some(rgba(0x262335ff).into()), editor_gutter_background: Some(rgba(0x262335ff).into()), diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index 9a037461db6db42aa6372e4e1f01abce110a8612..5328a6b58d849e2d7c78121594d2c5ca24e0f181 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -122,13 +122,13 @@ impl VsCodeThemeConverter { fn convert_theme_colors(&self) -> Result { let vscode_colors = &self.theme.colors; - let vscode_editor_background = vscode_colors - .editor_background + let vscode_panel_border = vscode_colors + .panel_border .as_ref() .traverse(|color| try_parse_color(&color))?; - let vscode_scrollbar_shadow = vscode_colors - .scrollbar_shadow + let vscode_editor_background = vscode_colors + .editor_background .as_ref() .traverse(|color| try_parse_color(&color))?; @@ -138,30 +138,15 @@ impl VsCodeThemeConverter { .traverse(|color| try_parse_color(&color))?; Ok(ThemeColorsRefinement { - border: vscode_colors - .panel_border - .as_ref() - .traverse(|color| try_parse_color(&color))?, - border_variant: vscode_colors - .panel_border - .as_ref() - .traverse(|color| try_parse_color(&color))?, + border: vscode_panel_border, + border_variant: vscode_panel_border, border_focused: vscode_colors .focus_border .as_ref() .traverse(|color| try_parse_color(&color))?, - border_disabled: vscode_colors - .panel_border - .as_ref() - .traverse(|color| try_parse_color(&color))?, - border_selected: vscode_colors - .panel_border - .as_ref() - .traverse(|color| try_parse_color(&color))?, - border_transparent: vscode_colors - .panel_border - .as_ref() - .traverse(|color| try_parse_color(&color))?, + border_disabled: vscode_panel_border, + border_selected: vscode_panel_border, + border_transparent: vscode_panel_border, elevated_surface_background: vscode_colors .dropdown_background .as_ref() @@ -248,8 +233,11 @@ impl VsCodeThemeConverter { .editor_foreground .as_ref() .traverse(|color| try_parse_color(&color))?, - scrollbar_track_background: vscode_scrollbar_shadow, - scrollbar_track_border: vscode_scrollbar_shadow, + scrollbar_track_background: vscode_editor_background, + scrollbar_track_border: vscode_colors + .scrollbar_shadow + .as_ref() + .traverse(|color| try_parse_color(&color))?, scrollbar_thumb_background: vscode_scrollbar_slider_background, scrollbar_thumb_border: vscode_scrollbar_slider_background, scrollbar_thumb_hover_background: vscode_colors diff --git a/crates/theme_importer/src/vscode/theme.rs b/crates/theme_importer/src/vscode/theme.rs index c86f7ce890d221ea39abbde4bd81b8fb3ff1a0a8..f8e2c98da5a2475fd394e4994ccf0e0867c478d2 100644 --- a/crates/theme_importer/src/vscode/theme.rs +++ b/crates/theme_importer/src/vscode/theme.rs @@ -1165,6 +1165,13 @@ pub struct VsCodeColors { )] pub status_bar_background: Option, + #[serde( + default, + rename = "statusBar.border", + deserialize_with = "empty_string_as_none" + )] + pub status_bar_border: Option, + #[serde( default, rename = "statusBar.foreground", From e271bbe8966a5e7ee455c2506c2dcb33729db3a9 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 11 Dec 2023 16:54:53 -0500 Subject: [PATCH 3/3] Use `editorOverviewRuler.border` for the scrollbar track border --- crates/theme2/src/themes/andromeda.rs | 4 ++-- crates/theme2/src/themes/ayu.rs | 6 ++--- crates/theme2/src/themes/dracula.rs | 1 + crates/theme2/src/themes/gruvbox.rs | 12 +++++----- crates/theme2/src/themes/night_owl.rs | 2 -- crates/theme2/src/themes/noctis.rs | 22 +++++++++---------- crates/theme2/src/themes/nord.rs | 2 +- crates/theme2/src/themes/palenight.rs | 3 --- crates/theme2/src/themes/rose_pine.rs | 6 ++--- crates/theme2/src/themes/synthwave_84.rs | 2 +- crates/theme_importer/src/vscode/converter.rs | 2 +- 11 files changed, 29 insertions(+), 33 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index a2de85aa82378bebb7738b41502435f879e483a7..33284cdbeee1bf548384ebc689861c9db0c69694 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -46,7 +46,7 @@ pub fn andromeda() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()), scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()), scrollbar_track_background: Some(rgba(0x23262eff).into()), - scrollbar_track_border: Some(rgba(0x23262eff).into()), + scrollbar_track_border: Some(rgba(0x1b1d23ff).into()), editor_background: Some(rgba(0x23262eff).into()), editor_gutter_background: Some(rgba(0x23262eff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), @@ -260,7 +260,7 @@ pub fn andromeda() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()), scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()), scrollbar_track_background: Some(rgba(0x262a33ff).into()), - scrollbar_track_border: Some(rgba(0x23262eff).into()), + scrollbar_track_border: Some(rgba(0x1b1d23ff).into()), editor_background: Some(rgba(0x262a33ff).into()), editor_gutter_background: Some(rgba(0x262a33ff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 65932e7cdafc26faf86117731f46af2ba8ad8354..0164e4786f88559bb4234d8acce95e463bdac57c 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -45,7 +45,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x8a919999).into()), scrollbar_thumb_border: Some(rgba(0x8a919966).into()), scrollbar_track_background: Some(rgba(0xf8f9faff).into()), - scrollbar_track_border: Some(rgba(0x6b7d8f00).into()), + scrollbar_track_border: Some(rgba(0x6b7d8f1f).into()), editor_background: Some(rgba(0xf8f9faff).into()), editor_gutter_background: Some(rgba(0xf8f9faff).into()), editor_line_number: Some(rgba(0x8a919966).into()), @@ -351,7 +351,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x707a8c99).into()), scrollbar_thumb_border: Some(rgba(0x707a8c66).into()), scrollbar_track_background: Some(rgba(0x1f2430ff).into()), - scrollbar_track_border: Some(rgba(0x171b2400).into()), + scrollbar_track_border: Some(rgba(0x171b24ff).into()), editor_background: Some(rgba(0x1f2430ff).into()), editor_gutter_background: Some(rgba(0x1f2430ff).into()), editor_line_number: Some(rgba(0x8a919966).into()), @@ -657,7 +657,7 @@ pub fn ayu() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x565b6699).into()), scrollbar_thumb_border: Some(rgba(0x565b6666).into()), scrollbar_track_background: Some(rgba(0x0b0e14ff).into()), - scrollbar_track_border: Some(rgba(0x1e232b00).into()), + scrollbar_track_border: Some(rgba(0x1e232bff).into()), editor_background: Some(rgba(0x0b0e14ff).into()), editor_gutter_background: Some(rgba(0x0b0e14ff).into()), editor_line_number: Some(rgba(0x6c738099).into()), diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index 54f29461691009ec86a09c58077d0608fe73f63c..5933ec46ffe60c0f5ff686b47312c8b283905faa 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -42,6 +42,7 @@ pub fn dracula() -> UserThemeFamily { tab_inactive_background: Some(rgba(0x21222cff).into()), tab_active_background: Some(rgba(0x282a36ff).into()), scrollbar_track_background: Some(rgba(0x282a36ff).into()), + scrollbar_track_border: Some(rgba(0x191a21ff).into()), editor_background: Some(rgba(0x282a36ff).into()), editor_gutter_background: Some(rgba(0x282a36ff).into()), editor_line_number: Some(rgba(0x6272a4ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 6ea8ee0c98f2be7706d9059ad3e9da36b51339c9..4573f55ca1725532f1e5f5e03d52da7ef7670b41 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -45,7 +45,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()), scrollbar_thumb_border: Some(rgba(0x50494599).into()), scrollbar_track_background: Some(rgba(0x1d2021ff).into()), - scrollbar_track_border: Some(rgba(0x1d2021ff).into()), + scrollbar_track_border: Some(rgba(0x1d202100).into()), editor_background: Some(rgba(0x1d2021ff).into()), editor_gutter_background: Some(rgba(0x1d2021ff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -337,7 +337,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()), scrollbar_thumb_border: Some(rgba(0x50494599).into()), scrollbar_track_background: Some(rgba(0x282828ff).into()), - scrollbar_track_border: Some(rgba(0x282828ff).into()), + scrollbar_track_border: Some(rgba(0x28282800).into()), editor_background: Some(rgba(0x282828ff).into()), editor_gutter_background: Some(rgba(0x282828ff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -629,7 +629,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()), scrollbar_thumb_border: Some(rgba(0x50494599).into()), scrollbar_track_background: Some(rgba(0x32302fff).into()), - scrollbar_track_border: Some(rgba(0x32302fff).into()), + scrollbar_track_border: Some(rgba(0x32302f00).into()), editor_background: Some(rgba(0x32302fff).into()), editor_gutter_background: Some(rgba(0x32302fff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -921,7 +921,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xbdae93ff).into()), scrollbar_thumb_border: Some(rgba(0xd5c4a199).into()), scrollbar_track_background: Some(rgba(0xf9f5d7ff).into()), - scrollbar_track_border: Some(rgba(0xf9f5d7ff).into()), + scrollbar_track_border: Some(rgba(0xf9f5d700).into()), editor_background: Some(rgba(0xf9f5d7ff).into()), editor_gutter_background: Some(rgba(0xf9f5d7ff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), @@ -1213,7 +1213,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xbdae93ff).into()), scrollbar_thumb_border: Some(rgba(0xd5c4a199).into()), scrollbar_track_background: Some(rgba(0xfbf1c7ff).into()), - scrollbar_track_border: Some(rgba(0xfbf1c7ff).into()), + scrollbar_track_border: Some(rgba(0xfbf1c700).into()), editor_background: Some(rgba(0xfbf1c7ff).into()), editor_gutter_background: Some(rgba(0xfbf1c7ff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), @@ -1505,7 +1505,7 @@ pub fn gruvbox() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xbdae93ff).into()), scrollbar_thumb_border: Some(rgba(0xd5c4a199).into()), scrollbar_track_background: Some(rgba(0xf2e5bcff).into()), - scrollbar_track_border: Some(rgba(0xf2e5bcff).into()), + scrollbar_track_border: Some(rgba(0xf2e5bc00).into()), editor_background: Some(rgba(0xf2e5bcff).into()), editor_gutter_background: Some(rgba(0xf2e5bcff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index e680b39554f3c77a33e46d6997f937d27c2c97e1..71c980e6315314d60d3d761c2bc66524ae732242 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -46,7 +46,6 @@ pub fn night_owl() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x084d8180).into()), scrollbar_thumb_border: Some(rgba(0x084d8180).into()), scrollbar_track_background: Some(rgba(0x011627ff).into()), - scrollbar_track_border: Some(rgba(0x010b14ff).into()), editor_background: Some(rgba(0x011627ff).into()), editor_gutter_background: Some(rgba(0x011627ff).into()), editor_line_number: Some(rgba(0x4b6479ff).into()), @@ -306,7 +305,6 @@ pub fn night_owl() -> UserThemeFamily { tab_inactive_background: Some(rgba(0xf0f0f0ff).into()), tab_active_background: Some(rgba(0xf6f6f6ff).into()), scrollbar_track_background: Some(rgba(0xfbfbfbff).into()), - scrollbar_track_border: Some(rgba(0xccccccff).into()), editor_background: Some(rgba(0xfbfbfbff).into()), editor_gutter_background: Some(rgba(0xfbfbfbff).into()), editor_line_number: Some(rgba(0x90a7b2ff).into()), diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index 974809054447488647778b17472fbcd60c7c4e8b..51b442a57e46de757b735c5a881be30bd02cdc9c 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -46,7 +46,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x008ee655).into()), scrollbar_thumb_border: Some(rgba(0x008ee633).into()), scrollbar_track_background: Some(rgba(0x07273bff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x07273bff).into()), editor_background: Some(rgba(0x07273bff).into()), editor_gutter_background: Some(rgba(0x07273bff).into()), editor_line_number: Some(rgba(0x4d6c80ff).into()), @@ -323,7 +323,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xeb609144).into()), scrollbar_thumb_border: Some(rgba(0xeb609133).into()), scrollbar_track_background: Some(rgba(0x322a2dff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x322a2dff).into()), editor_background: Some(rgba(0x322a2dff).into()), editor_gutter_background: Some(rgba(0x322a2dff).into()), editor_line_number: Some(rgba(0x715b63ff).into()), @@ -600,7 +600,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0xf4f6f6ff).into()), - scrollbar_track_border: Some(rgba(0x00000055).into()), + scrollbar_track_border: Some(rgba(0xf4f6f6ff).into()), editor_background: Some(rgba(0xf4f6f6ff).into()), editor_gutter_background: Some(rgba(0xf4f6f6ff).into()), editor_line_number: Some(rgba(0xa0abacff).into()), @@ -877,7 +877,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x7060eb62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0xf2f1f8ff).into()), - scrollbar_track_border: Some(rgba(0x00000055).into()), + scrollbar_track_border: Some(rgba(0xf2f1f8ff).into()), editor_background: Some(rgba(0xf2f1f8ff).into()), editor_gutter_background: Some(rgba(0xf2f1f8ff).into()), editor_line_number: Some(rgba(0x9d9ab1ff).into()), @@ -1154,7 +1154,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0xfef8ecff).into()), - scrollbar_track_border: Some(rgba(0x00000055).into()), + scrollbar_track_border: Some(rgba(0xfef8ecff).into()), editor_background: Some(rgba(0xfef8ecff).into()), editor_gutter_background: Some(rgba(0xfef8ecff).into()), editor_line_number: Some(rgba(0xa0abacff).into()), @@ -1431,7 +1431,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x3f7fa655).into()), scrollbar_thumb_border: Some(rgba(0x3f7fa633).into()), scrollbar_track_background: Some(rgba(0x1b2932ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x1b2932ff).into()), editor_background: Some(rgba(0x1b2932ff).into()), editor_gutter_background: Some(rgba(0x1b2932ff).into()), editor_line_number: Some(rgba(0x5d6e79ff).into()), @@ -1708,7 +1708,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0x052529ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x052529ff).into()), editor_background: Some(rgba(0x052529ff).into()), editor_gutter_background: Some(rgba(0x052529ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -1985,7 +1985,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0x031417ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x031417ff).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -2262,7 +2262,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()), scrollbar_thumb_border: Some(rgba(0x6a90955b).into()), scrollbar_track_background: Some(rgba(0x031417ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x031417ff).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -2539,7 +2539,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x7060eb55).into()), scrollbar_thumb_border: Some(rgba(0x7060eb33).into()), scrollbar_track_background: Some(rgba(0x292640ff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x292640ff).into()), editor_background: Some(rgba(0x292640ff).into()), editor_gutter_background: Some(rgba(0x292640ff).into()), editor_line_number: Some(rgba(0x5c5973ff).into()), @@ -2816,7 +2816,7 @@ pub fn noctis() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0xa660eb55).into()), scrollbar_thumb_border: Some(rgba(0xa660eb33).into()), scrollbar_track_background: Some(rgba(0x30243dff).into()), - scrollbar_track_border: Some(rgba(0x00000044).into()), + scrollbar_track_border: Some(rgba(0x30243dff).into()), editor_background: Some(rgba(0x30243dff).into()), editor_gutter_background: Some(rgba(0x30243dff).into()), editor_line_number: Some(rgba(0x665973ff).into()), diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index ceb57ff4df632733a9d7a24a590b5946c4aa844a..949926c6857d0b0b0d183328c8e837f0007c7afc 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -45,7 +45,7 @@ pub fn nord() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x434c5eaa).into()), scrollbar_thumb_border: Some(rgba(0x434c5e99).into()), scrollbar_track_background: Some(rgba(0x2e3440ff).into()), - scrollbar_track_border: Some(rgba(0x00000066).into()), + scrollbar_track_border: Some(rgba(0x3b4252ff).into()), editor_background: Some(rgba(0x2e3440ff).into()), editor_gutter_background: Some(rgba(0x2e3440ff).into()), editor_line_number: Some(rgba(0x4c566aff).into()), diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index fbf1f50def1b02417685cd42834c5d93ade4ff28..ab47cc104643bc63fba6a85a778474b2fb4925c0 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -46,7 +46,6 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), scrollbar_track_background: Some(rgba(0x292d3eff).into()), - scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), @@ -332,7 +331,6 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), scrollbar_track_background: Some(rgba(0x292d3eff).into()), - scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), @@ -618,7 +616,6 @@ pub fn palenight() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()), scrollbar_thumb_border: Some(rgba(0x694ca466).into()), scrollbar_track_background: Some(rgba(0x292d3eff).into()), - scrollbar_track_border: Some(rgba(0x292d3e00).into()), editor_background: Some(rgba(0x292d3eff).into()), editor_gutter_background: Some(rgba(0x292d3eff).into()), editor_line_number: Some(rgba(0x4c5374ff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 29cb2030adf122ca4acebdb1f56ea06d95122b53..d9091df347dc891d628d601ccea2b8a7c965cf56 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -46,7 +46,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x6e6a8666).into()), scrollbar_thumb_border: Some(rgba(0x6e6a8633).into()), scrollbar_track_background: Some(rgba(0x191724ff).into()), - scrollbar_track_border: Some(rgba(0x1f1d2e4d).into()), + scrollbar_track_border: Some(rgba(0x6e6a8666).into()), editor_background: Some(rgba(0x191724ff).into()), editor_gutter_background: Some(rgba(0x191724ff).into()), editor_line_number: Some(rgba(0x908caaff).into()), @@ -305,7 +305,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x817c9c4d).into()), scrollbar_thumb_border: Some(rgba(0x817c9c26).into()), scrollbar_track_background: Some(rgba(0x232136ff).into()), - scrollbar_track_border: Some(rgba(0x2a273f4d).into()), + scrollbar_track_border: Some(rgba(0x817c9c4d).into()), editor_background: Some(rgba(0x232136ff).into()), editor_gutter_background: Some(rgba(0x232136ff).into()), editor_line_number: Some(rgba(0x908caaff).into()), @@ -564,7 +564,7 @@ pub fn rose_pine() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x6e6a8626).into()), scrollbar_thumb_border: Some(rgba(0x6e6a8614).into()), scrollbar_track_background: Some(rgba(0xfaf4edff).into()), - scrollbar_track_border: Some(rgba(0xfffaf34d).into()), + scrollbar_track_border: Some(rgba(0x6e6a8626).into()), editor_background: Some(rgba(0xfaf4edff).into()), editor_gutter_background: Some(rgba(0xfaf4edff).into()), editor_line_number: Some(rgba(0x797593ff).into()), diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index f460d75816346c8f024bf152d512df524daac4b2..6b7a73109a30934532cd5d3a47d0b7b540322c87 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -37,7 +37,7 @@ pub fn synthwave_84() -> UserThemeFamily { scrollbar_thumb_hover_background: Some(rgba(0x9d8bca50).into()), scrollbar_thumb_border: Some(rgba(0x9d8bca30).into()), scrollbar_track_background: Some(rgba(0x262335ff).into()), - scrollbar_track_border: Some(rgba(0x2a2139ff).into()), + scrollbar_track_border: Some(rgba(0x34294fb3).into()), editor_background: Some(rgba(0x262335ff).into()), editor_gutter_background: Some(rgba(0x262335ff).into()), editor_line_number: Some(rgba(0xffffff73).into()), diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index 5328a6b58d849e2d7c78121594d2c5ca24e0f181..9e4dc56eb8189a75ecfccd02d7fe5a2f7ee2ef8c 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -235,7 +235,7 @@ impl VsCodeThemeConverter { .traverse(|color| try_parse_color(&color))?, scrollbar_track_background: vscode_editor_background, scrollbar_track_border: vscode_colors - .scrollbar_shadow + .editor_overview_ruler_border .as_ref() .traverse(|color| try_parse_color(&color))?, scrollbar_thumb_background: vscode_scrollbar_slider_background,