From fe46459982b04b6fb72d09206b4b621564cde31e Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 11 Dec 2023 12:59:03 -0500 Subject: [PATCH] Pull more scrollbar colors from VS Code --- crates/theme2/src/themes/andromeda.rs | 4 ++++ crates/theme2/src/themes/ayu.rs | 6 +++++ crates/theme2/src/themes/gruvbox.rs | 12 ++++++++++ crates/theme2/src/themes/night_owl.rs | 3 +++ 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/synthwave_84.rs | 2 ++ crates/theme_importer/src/vscode/converter.rs | 22 ++++++++++++------- 10 files changed, 77 insertions(+), 8 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index fa042c6e6bfbf9d158763fffc5ab1204e66af15b..c9bb42f2c0248b5fd3de40420265b493a80d387b 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -43,7 +43,9 @@ pub fn andromeda() -> UserThemeFamily { tab_active_background: Some(rgba(0x23262eff).into()), 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_border: Some(rgba(0x23262eff).into()), editor_background: Some(rgba(0x23262eff).into()), editor_gutter_background: Some(rgba(0x23262eff).into()), editor_line_number: Some(rgba(0x746f77ff).into()), @@ -254,7 +256,9 @@ pub fn andromeda() -> UserThemeFamily { tab_active_background: Some(rgba(0x262a33ff).into()), 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_border: Some(rgba(0x23262eff).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 a9c325b55de488d86f96e16441799f4ac2b2f462..02374db5e08cd32b106497f71037cf5eeba3548c 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -42,7 +42,9 @@ pub fn ayu() -> UserThemeFamily { tab_active_background: Some(rgba(0xf8f9faff).into()), 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_border: Some(rgba(0x6b7d8f00).into()), editor_background: Some(rgba(0xf8f9faff).into()), editor_gutter_background: Some(rgba(0xf8f9faff).into()), editor_line_number: Some(rgba(0x8a919966).into()), @@ -345,7 +347,9 @@ pub fn ayu() -> UserThemeFamily { tab_active_background: Some(rgba(0x1f2430ff).into()), 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_border: Some(rgba(0x171b2400).into()), editor_background: Some(rgba(0x1f2430ff).into()), editor_gutter_background: Some(rgba(0x1f2430ff).into()), editor_line_number: Some(rgba(0x8a919966).into()), @@ -648,7 +652,9 @@ pub fn ayu() -> UserThemeFamily { tab_active_background: Some(rgba(0x0b0e14ff).into()), 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_border: Some(rgba(0x1e232b00).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/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 1679e55cf512bc62caa5658b5a394740c4742d55..42a1733602bf1ef8a3532255530eca81c66f07f0 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -42,7 +42,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_active_background: Some(rgba(0x32302fff).into()), scrollbar_thumb_background: Some(rgba(0x50494599).into()), 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()), editor_background: Some(rgba(0x1d2021ff).into()), editor_gutter_background: Some(rgba(0x1d2021ff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -331,7 +333,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_active_background: Some(rgba(0x3c3836ff).into()), scrollbar_thumb_background: Some(rgba(0x50494599).into()), 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()), editor_background: Some(rgba(0x282828ff).into()), editor_gutter_background: Some(rgba(0x282828ff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -620,7 +624,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_active_background: Some(rgba(0x504945ff).into()), scrollbar_thumb_background: Some(rgba(0x50494599).into()), 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()), editor_background: Some(rgba(0x32302fff).into()), editor_gutter_background: Some(rgba(0x32302fff).into()), editor_line_number: Some(rgba(0x665c54ff).into()), @@ -909,7 +915,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_active_background: Some(rgba(0xf2e5bcff).into()), scrollbar_thumb_background: Some(rgba(0xd5c4a199).into()), 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()), editor_background: Some(rgba(0xf9f5d7ff).into()), editor_gutter_background: Some(rgba(0xf9f5d7ff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), @@ -1198,7 +1206,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_active_background: Some(rgba(0xebdbb2ff).into()), scrollbar_thumb_background: Some(rgba(0xd5c4a199).into()), 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()), editor_background: Some(rgba(0xfbf1c7ff).into()), editor_gutter_background: Some(rgba(0xfbf1c7ff).into()), editor_line_number: Some(rgba(0xbdae93ff).into()), @@ -1487,7 +1497,9 @@ pub fn gruvbox() -> UserThemeFamily { tab_active_background: Some(rgba(0xd5c4a1ff).into()), scrollbar_thumb_background: Some(rgba(0xd5c4a199).into()), 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()), 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 73a54287fc7d5fee5aea109bac0cf567182e0d49..7d7d64fdacd123207c0819564839250ad98dc396 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -43,7 +43,9 @@ pub fn night_owl() -> UserThemeFamily { tab_active_background: Some(rgba(0x0b2942ff).into()), 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_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()), @@ -302,6 +304,7 @@ pub fn night_owl() -> UserThemeFamily { tab_inactive_background: Some(rgba(0xf0f0f0ff).into()), tab_active_background: Some(rgba(0xf6f6f6ff).into()), scrollbar_track_background: Some(rgba(0xccccccff).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 5bb3af98320940025d3683e52fa44515562052cd..0881e191801936ba48e3158e992a53c9ffb7c344 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -43,7 +43,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x07273bff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x07273bff).into()), editor_gutter_background: Some(rgba(0x07273bff).into()), editor_line_number: Some(rgba(0x4d6c80ff).into()), @@ -317,7 +319,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x322a2dff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x322a2dff).into()), editor_gutter_background: Some(rgba(0x322a2dff).into()), editor_line_number: Some(rgba(0x715b63ff).into()), @@ -591,7 +595,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0xf4f6f6ff).into()), 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_border: Some(rgba(0x00000055).into()), editor_background: Some(rgba(0xf4f6f6ff).into()), editor_gutter_background: Some(rgba(0xf4f6f6ff).into()), editor_line_number: Some(rgba(0xa0abacff).into()), @@ -865,7 +871,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0xf2f1f8ff).into()), 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_border: Some(rgba(0x00000055).into()), editor_background: Some(rgba(0xf2f1f8ff).into()), editor_gutter_background: Some(rgba(0xf2f1f8ff).into()), editor_line_number: Some(rgba(0x9d9ab1ff).into()), @@ -1139,7 +1147,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0xfef8ecff).into()), 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_border: Some(rgba(0x00000055).into()), editor_background: Some(rgba(0xfef8ecff).into()), editor_gutter_background: Some(rgba(0xfef8ecff).into()), editor_line_number: Some(rgba(0xa0abacff).into()), @@ -1413,7 +1423,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x1b2932ff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x1b2932ff).into()), editor_gutter_background: Some(rgba(0x1b2932ff).into()), editor_line_number: Some(rgba(0x5d6e79ff).into()), @@ -1687,7 +1699,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x052529ff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x052529ff).into()), editor_gutter_background: Some(rgba(0x052529ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -1961,7 +1975,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x031417ff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -2235,7 +2251,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x031417ff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x031417ff).into()), editor_gutter_background: Some(rgba(0x031417ff).into()), editor_line_number: Some(rgba(0x4e6b6eff).into()), @@ -2509,7 +2527,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x292640ff).into()), 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_border: Some(rgba(0x00000044).into()), editor_background: Some(rgba(0x292640ff).into()), editor_gutter_background: Some(rgba(0x292640ff).into()), editor_line_number: Some(rgba(0x5c5973ff).into()), @@ -2783,7 +2803,9 @@ pub fn noctis() -> UserThemeFamily { tab_active_background: Some(rgba(0x30243dff).into()), 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_border: Some(rgba(0x00000044).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 836ad8b11756fd12d171f76dadd2513a275a2a34..3274c8648b2923a270f52d25f141af2025771e79 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -42,7 +42,9 @@ pub fn nord() -> UserThemeFamily { tab_active_background: Some(rgba(0x3b4252ff).into()), 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_border: Some(rgba(0x00000066).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 be0ab6d86bc1a9a30dc93144111f60eb1e3b89bc..5bda3a4d25186a73a78429f2d664679db9cb894b 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -43,7 +43,9 @@ pub fn palenight() -> UserThemeFamily { tab_active_background: Some(rgba(0x292d3eff).into()), 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_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()), @@ -326,7 +328,9 @@ pub fn palenight() -> UserThemeFamily { tab_active_background: Some(rgba(0x292d3eff).into()), 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_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()), @@ -609,7 +613,9 @@ pub fn palenight() -> UserThemeFamily { tab_active_background: Some(rgba(0x25293aff).into()), 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_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 bfc49d08ef756980c0873d196d8f53ebc1f06da6..e0a934177bb769f93f48f303485a064b7486e807 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -43,7 +43,9 @@ pub fn rose_pine() -> UserThemeFamily { tab_active_background: Some(rgba(0x6e6a861a).into()), 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_border: Some(rgba(0x1f1d2e4d).into()), editor_background: Some(rgba(0x191724ff).into()), editor_gutter_background: Some(rgba(0x191724ff).into()), editor_line_number: Some(rgba(0x908caaff).into()), @@ -299,7 +301,9 @@ pub fn rose_pine() -> UserThemeFamily { tab_active_background: Some(rgba(0x817c9c14).into()), 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_border: Some(rgba(0x2a273f4d).into()), editor_background: Some(rgba(0x232136ff).into()), editor_gutter_background: Some(rgba(0x232136ff).into()), editor_line_number: Some(rgba(0x908caaff).into()), @@ -555,7 +559,9 @@ pub fn rose_pine() -> UserThemeFamily { tab_active_background: Some(rgba(0x6e6a860d).into()), 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_border: Some(rgba(0xfffaf34d).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 e9cedd98409d353d5f12e5e6ed119ca9d7632c33..df449f6c50b4e48d963ac0ac1f7626be2ee9ffd5 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -35,7 +35,9 @@ pub fn synthwave_84() -> UserThemeFamily { tab_inactive_background: Some(rgba(0x262335ff).into()), 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_border: Some(rgba(0x2a2139ff).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 8f2aea5cba3cab4b926b1cd6328e0e320cf3c03b..82256fb8db939641c57f4b685677f0de23cba5f0 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -127,6 +127,16 @@ impl VsCodeThemeConverter { .as_ref() .traverse(|color| try_parse_color(&color))?; + let vscode_scrollbar_shadow = vscode_colors + .scrollbar_shadow + .as_ref() + .traverse(|color| try_parse_color(&color))?; + + let vscode_scrollbar_slider_background = vscode_colors + .scrollbar_slider_background + .as_ref() + .traverse(|color| try_parse_color(&color))?; + Ok(ThemeColorsRefinement { border: vscode_colors .panel_border @@ -234,14 +244,10 @@ impl VsCodeThemeConverter { .editor_foreground .as_ref() .traverse(|color| try_parse_color(&color))?, - scrollbar_track_background: vscode_colors - .scrollbar_shadow - .as_ref() - .traverse(|color| try_parse_color(&color))?, - scrollbar_thumb_background: vscode_colors - .scrollbar_slider_background - .as_ref() - .traverse(|color| try_parse_color(&color))?, + scrollbar_track_background: vscode_scrollbar_shadow, + scrollbar_track_border: vscode_scrollbar_shadow, + scrollbar_thumb_background: vscode_scrollbar_slider_background, + scrollbar_thumb_border: vscode_scrollbar_slider_background, scrollbar_thumb_hover_background: vscode_colors .scrollbar_slider_hover_background .as_ref()