From 36d0b71f2767c0717ca84c074f10dd0d403aa628 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Wed, 29 May 2024 11:34:59 +0200 Subject: [PATCH] project panel: adjust right border and make active entry more prominent when panel is not focused (#12420) Release Notes: - N/A --- crates/project_panel/src/project_panel.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 227f805a6d..73a64af6f8 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1938,7 +1938,7 @@ impl ProjectPanel { ListItem::new(entry_id.to_proto() as usize) .indent_level(depth) .indent_step_size(px(settings.indent_size)) - .selected(is_marked) + .selected(is_marked || is_active) .when_some(canonical_path, |this, path| { this.end_slot::( div() @@ -2052,17 +2052,20 @@ impl ProjectPanel { )), ) .border_1() + .border_r_2() .rounded_none() .hover(|style| { - if is_active || is_marked { + if is_active { style } else { let hover_color = cx.theme().colors().ghost_element_hover; style.bg(hover_color).border_color(hover_color) } }) - .when(is_marked, |this| { - this.border_color(cx.theme().colors().ghost_element_selected) + .when(is_marked || is_active, |this| { + let colors = cx.theme().colors(); + this.when(is_marked, |this| this.bg(colors.ghost_element_selected)) + .border_color(colors.ghost_element_selected) }) .when( is_active && self.focus_handle.contains_focused(cx),