diff --git a/assets/icons/debug.svg b/assets/icons/debug.svg index 8cea0c460402fbb36769aa0aaadab9f80513d101..ff51e42b1a9483f4f6d0382d67aa34bd3405f1ff 100644 --- a/assets/icons/debug.svg +++ b/assets/icons/debug.svg @@ -1 +1,12 @@ - + + + + + + + + + + + + diff --git a/assets/icons/file_tree.svg b/assets/icons/file_tree.svg index 4c921b135183b7b58126f16c68f39aec22677285..a140cd70b12d1be180d2c683d59400212969c47a 100644 --- a/assets/icons/file_tree.svg +++ b/assets/icons/file_tree.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/assets/icons/git_branch_small.svg b/assets/icons/git_branch_small.svg index d23fc176ac797fff35c6c9d35176d5e03c6170fe..22832d6fedfc5221c31c81eae497f8172b59c21e 100644 --- a/assets/icons/git_branch_small.svg +++ b/assets/icons/git_branch_small.svg @@ -1,6 +1,7 @@ - - - - - + + + + + + diff --git a/assets/icons/list_tree.svg b/assets/icons/list_tree.svg index 8cf157ec135d13395fc8ac66d8f8086f0d199a2e..09872a60f7ed9c85e89f06b7384b083a7f4b5779 100644 --- a/assets/icons/list_tree.svg +++ b/assets/icons/list_tree.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/assets/icons/terminal_alt.svg b/assets/icons/terminal_alt.svg new file mode 100644 index 0000000000000000000000000000000000000000..7afb89db2130b8d9233c1662d7fcf86f63de305a --- /dev/null +++ b/assets/icons/terminal_alt.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/icons/user_group.svg b/assets/icons/user_group.svg index aa99277646653c899ee049547e5574b76b25b840..ac1f7bdc633190f88b202d9e5ae7430af225aecd 100644 --- a/assets/icons/user_group.svg +++ b/assets/icons/user_group.svg @@ -1,3 +1,5 @@ - + + + diff --git a/assets/icons/zed_assistant.svg b/assets/icons/zed_assistant.svg index 693d86f929ff170f08edf3d2a0a7a28af17a30bf..d21252de8c234611ddd41caff287e3fc0d540ed3 100644 --- a/assets/icons/zed_assistant.svg +++ b/assets/icons/zed_assistant.svg @@ -1,5 +1,5 @@ - + diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs index 76a04e036dc92d9ebbf848fc34bb21195862b99a..4151e6b2ea03c92bd43064e93a6a37fd0bc3cbf2 100644 --- a/crates/icons/src/icons.rs +++ b/crates/icons/src/icons.rs @@ -247,6 +247,7 @@ pub enum IconName { SwatchBook, Tab, Terminal, + TerminalAlt, TextSnippet, ThumbsDown, ThumbsUp, diff --git a/crates/search/src/search_status_button.rs b/crates/search/src/search_status_button.rs index fcdf36041f282376716aac3bde78baf8a667a68e..ff2ee1641d07a68c52e88a9686e90b2f3f40c4c5 100644 --- a/crates/search/src/search_status_button.rs +++ b/crates/search/src/search_status_button.rs @@ -1,9 +1,6 @@ use editor::EditorSettings; use settings::Settings as _; -use ui::{ - ButtonCommon, ButtonLike, Clickable, Color, Context, Icon, IconName, IconSize, ParentElement, - Render, Styled, Tooltip, Window, h_flex, -}; +use ui::{ButtonCommon, Clickable, Context, Render, Tooltip, Window, prelude::*}; use workspace::{ItemHandle, StatusItemView}; pub struct SearchButton; @@ -16,18 +13,15 @@ impl SearchButton { impl Render for SearchButton { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl ui::IntoElement { - let button = h_flex().gap_2(); + let button = div(); + if !EditorSettings::get_global(cx).search.button { - return button; + return button.w_0().invisible(); } button.child( - ButtonLike::new("project-search-indicator") - .child( - Icon::new(IconName::MagnifyingGlass) - .size(IconSize::Small) - .color(Color::Default), - ) + IconButton::new("project-search-indicator", IconName::MagnifyingGlass) + .icon_size(IconSize::Small) .tooltip(|window, cx| { Tooltip::for_action( "Project Search", diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs index f6eee3065ca974449315ab2ac519de1acb5da11e..cb1e3628848e9e850fa0c13f8b659259a1e6fd48 100644 --- a/crates/terminal_view/src/terminal_panel.rs +++ b/crates/terminal_view/src/terminal_panel.rs @@ -1437,7 +1437,7 @@ impl Panel for TerminalPanel { if (self.is_enabled(cx) || !self.has_no_terminals(cx)) && TerminalSettings::get_global(cx).button { - Some(IconName::Terminal) + Some(IconName::TerminalAlt) } else { None } diff --git a/crates/ui/src/components/progress/progress_bar.rs b/crates/ui/src/components/progress/progress_bar.rs index 67b6be6723fc9441a96321003f7194121467ea14..5cc5abd36d041bc03676410983020b94ac8d8809 100644 --- a/crates/ui/src/components/progress/progress_bar.rs +++ b/crates/ui/src/components/progress/progress_bar.rs @@ -69,8 +69,7 @@ impl RenderOnce for ProgressBar { .w_full() .h(px(8.0)) .rounded_full() - .py(px(2.0)) - .px(px(4.0)) + .p(px(2.0)) .bg(self.bg_color) .shadow(vec![gpui::BoxShadow { color: gpui::black().opacity(0.08), diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs index 8fcd55b784fc4202a34a1a34f72590933bb0f3d1..c8301dcf352f63db50586ee3a5e603a4583f6280 100644 --- a/crates/workspace/src/dock.rs +++ b/crates/workspace/src/dock.rs @@ -221,9 +221,9 @@ pub enum DockPosition { impl DockPosition { fn label(&self) -> &'static str { match self { - Self::Left => "left", - Self::Bottom => "bottom", - Self::Right => "right", + Self::Left => "Left", + Self::Bottom => "Bottom", + Self::Right => "Right", } } @@ -864,7 +864,7 @@ impl Render for PanelButtons { let action = dock.toggle_action(); let tooltip: SharedString = - format!("Close {} dock", dock.position.label()).into(); + format!("Close {} Dock", dock.position.label()).into(); (action, tooltip) } else { @@ -923,6 +923,7 @@ impl Render for PanelButtons { .collect(); let has_buttons = !buttons.is_empty(); + h_flex() .gap_1() .children(buttons) diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs index 798d49eec5c7e0ea8d8c4bc7427389af8de2c658..edeb382de7d386b37d81b2649af85cf97f9e8b31 100644 --- a/crates/workspace/src/status_bar.rs +++ b/crates/workspace/src/status_bar.rs @@ -42,7 +42,7 @@ impl Render for StatusBar { .justify_between() .gap(DynamicSpacing::Base08.rems(cx)) .py(DynamicSpacing::Base04.rems(cx)) - .px(DynamicSpacing::Base08.rems(cx)) + .px(DynamicSpacing::Base06.rems(cx)) .bg(cx.theme().colors().status_bar_background) .map(|el| match window.window_decorations() { Decorations::Server => el, @@ -58,22 +58,23 @@ impl Render for StatusBar { .border_b(px(1.0)) .border_color(cx.theme().colors().status_bar_background), }) - .child(self.render_left_tools(cx)) - .child(self.render_right_tools(cx)) + .child(self.render_left_tools()) + .child(self.render_right_tools()) } } impl StatusBar { - fn render_left_tools(&self, cx: &mut Context) -> impl IntoElement { + fn render_left_tools(&self) -> impl IntoElement { h_flex() - .gap(DynamicSpacing::Base04.rems(cx)) + .gap_1() .overflow_x_hidden() .children(self.left_items.iter().map(|item| item.to_any())) } - fn render_right_tools(&self, cx: &mut Context) -> impl IntoElement { + fn render_right_tools(&self) -> impl IntoElement { h_flex() - .gap(DynamicSpacing::Base04.rems(cx)) + .gap_1() + .overflow_x_hidden() .children(self.right_items.iter().rev().map(|item| item.to_any())) } }