zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

theme_importer: Fall back to inactive tab background if no active tab background set (#3598)

Browse Source 
This PR makes it so the `theme_importer` falls back to the inactive tab
background color if the theme doesn't not an active tab background
color.

This fixes the active tab color in the Synthwave 84 theme.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-12-11 17:39:46 -05:00 committed by GitHub
parent 050ff6b27d
commit 3120a9cbea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/theme2/src/themes/synthwave_84.rs
View File

@ -33,6 +33,7 @@ pub fn synthwave_84() -> UserThemeFamily {
toolbar_background: Some(rgba(0x262335ff).into()),
tab_bar_background: Some(rgba(0x241b2fff).into()),
tab_inactive_background: Some(rgba(0x262335ff).into()),
tab_active_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()),

13
crates/theme_importer/src/vscode/converter.rs
View File

@ -127,6 +127,11 @@ impl VsCodeThemeConverter {
.as_ref()
.traverse(|color| try_parse_color(&color))?;
let vscode_tab_inactive_background = vscode_colors
.tab_inactive_background
.as_ref()
.traverse(|color| try_parse_color(&color))?;
let vscode_editor_background = vscode_colors
.editor_background
.as_ref()
@ -213,11 +218,9 @@ impl VsCodeThemeConverter {
tab_active_background: vscode_colors
.tab_active_background
.as_ref()
.traverse(|color| try_parse_color(&color))?,
tab_inactive_background: vscode_colors
.tab_inactive_background
.as_ref()
.traverse(|color| try_parse_color(&color))?,
.traverse(|color| try_parse_color(&color))?
.or(vscode_tab_inactive_background),
tab_inactive_background: vscode_tab_inactive_background,
toolbar_background: vscode_colors
.breadcrumb_background
.as_ref()