From 138a0b042d3d31f235b71e8fcd03cae17d8207dc Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 24 May 2022 09:12:57 +0200 Subject: [PATCH] Make fade of ignored entries styleable --- crates/project_panel/src/project_panel.rs | 5 ++--- crates/theme/src/theme.rs | 1 + styles/src/styleTree/projectPanel.ts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 9905c5e6dda07d801f46648b4c68467171b4b923..720ef249f566542fa0007612aee6cf07a911e20a 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -787,10 +787,9 @@ impl ProjectPanel { MouseEventHandler::new::(entry_id.to_usize(), cx, |state, _| { let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width; let mut style = theme.entry.style_for(state, details.is_selected).clone(); - // TODO: get style from theme. if details.is_ignored { - style.text.color.fade_out(0.6); - style.icon_color.fade_out(0.6); + style.text.color.fade_out(theme.ignored_entry_fade); + style.icon_color.fade_out(theme.ignored_entry_fade); } let row_container_style = if show_editor { theme.filename_editor.container diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index a307ee2d6f2bf8a6f17c99ec60aabf89df35ebeb..8de49be5dfeec999844fbe59b9e5c1dd7dd067bf 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -223,6 +223,7 @@ pub struct ProjectPanel { #[serde(flatten)] pub container: ContainerStyle, pub entry: Interactive, + pub ignored_entry_fade: f32, pub filename_editor: FieldEditor, pub indent_width: f32, } diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 6892b666d9b37cab5c126ecfedb91feea9c335db..2f3e3eea72195e415a2a536bc959414f857b30b9 100644 --- a/styles/src/styleTree/projectPanel.ts +++ b/styles/src/styleTree/projectPanel.ts @@ -26,6 +26,7 @@ export default function projectPanel(theme: Theme) { text: text(theme, "mono", "active", { size: "sm" }), } }, + ignoredEntryFade: 0.6, filenameEditor: { background: backgroundColor(theme, 500, "active"), text: text(theme, "mono", "primary", { size: "sm" }),