Merge pull request #1831 from zed-industries/theme-tweaks

Theme tweaks

crates/auto_update/src/update_notification.rs

@@ -51,7 +51,7 @@ impl View for UpdateNotification {
                         .with_child(
                             MouseEventHandler::<Cancel>::new(0, cx, |state, _| {
                                 let style = theme.dismiss_button.style_for(state, false);
-                                Svg::new("icons/x_mark_thin_8.svg")
+                                Svg::new("icons/x_mark_8.svg")
                                     .with_color(style.color)
                                     .constrained()
                                     .with_width(style.icon_width)

crates/collab_ui/src/collab_titlebar_item.rs

@@ -54,6 +54,7 @@ impl View for CollabTitlebarItem {
         let theme = cx.global::<Settings>().theme.clone();
 
         let mut container = Flex::row();
+
         container.add_children(self.render_toggle_screen_sharing_button(&theme, cx));
 
         if workspace.read(cx).client().status().borrow().is_connected() {
@@ -324,6 +325,8 @@ impl CollabTitlebarItem {
             cx,
         )
         .aligned()
+        .contained()
+        .with_margin_left(theme.workspace.titlebar.avatar_margin)
         .boxed()
     }
 

crates/collab_ui/src/notifications.rs

@@ -52,7 +52,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
                 .with_child(
                     MouseEventHandler::<Dismiss>::new(user.id as usize, cx, |state, _| {
                         let style = theme.dismiss_button.style_for(state, false);
-                        Svg::new("icons/x_mark_thin_8.svg")
+                        Svg::new("icons/x_mark_8.svg")
                             .with_color(style.color)
                             .constrained()
                             .with_width(style.icon_width)

crates/project_panel/src/project_panel.rs

@@ -1015,15 +1015,17 @@ impl ProjectPanel {
         let show_editor = details.is_editing && !details.is_processing;
         MouseEventHandler::<Self>::new(entry_id.to_usize(), cx, |state, cx| {
             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();
-            if details.is_ignored {
-                style.text.color.fade_out(theme.ignored_entry_fade);
-                style.icon_color.fade_out(theme.ignored_entry_fade);
-            }
-            if details.is_cut {
-                style.text.color.fade_out(theme.cut_entry_fade);
-                style.icon_color.fade_out(theme.cut_entry_fade);
-            }
+
+            let entry_style = if details.is_cut {
+                &theme.cut_entry
+            } else if details.is_ignored {
+                &theme.ignored_entry
+            } else {
+                &theme.entry
+            };
+
+            let style = entry_style.style_for(state, details.is_selected).clone();
+
             let row_container_style = if show_editor {
                 theme.filename_editor.container
             } else {

crates/theme/src/theme.rs

@@ -326,8 +326,8 @@ pub struct ProjectPanel {
     #[serde(flatten)]
     pub container: ContainerStyle,
     pub entry: Interactive<ProjectPanelEntry>,
-    pub cut_entry_fade: f32,
-    pub ignored_entry_fade: f32,
+    pub ignored_entry: Interactive<ProjectPanelEntry>,
+    pub cut_entry: Interactive<ProjectPanelEntry>,
     pub filename_editor: FieldEditor,
     pub indent_width: f32,
 }

crates/workspace/src/pane.rs

@@ -1298,7 +1298,7 @@ impl Pane {
                     ConstrainedBox::new(if hovered {
                         let item_id = item.id();
                         enum TabCloseButton {}
-                        let icon = Svg::new("icons/x_mark_thin_8.svg");
+                        let icon = Svg::new("icons/x_mark_8.svg");
                         MouseEventHandler::<TabCloseButton>::new(item_id, cx, |mouse_state, _| {
                             if mouse_state.hovered() {
                                 icon.with_color(tab_style.icon_close_active).boxed()
@@ -1361,7 +1361,7 @@ impl Pane {
             // Add the close dock button if this pane is a dock
             .with_children(
                 self.docked
-                    .map(|_| tab_bar_button(3, "icons/x_mark_thin_8.svg", cx, |_| HideDock)),
+                    .map(|_| tab_bar_button(3, "icons/x_mark_8.svg", cx, |_| HideDock)),
             )
             .contained()
             .with_style(theme.workspace.tab_bar.pane_button_container)