Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Add a bunch of stray design refinement throughout (#60937)
Danilo Leala496bf0ff6c0
diff --git a/assets/icons/file.svg b/assets/icons/file.svgindex 60cf2537d9e..037ade6827d 100644--- a/assets/icons/file.svg+++ b/assets/icons/file.svg@@ -1 +1,4 @@-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.875 2H4.25c-.332 0-.65.126-.884.351-.234.226-.366.53-.366.849v9.6c0 .318.132.623.366.849.235.225.552.351.884.351h7.5c.332 0 .65-.127.884-.351.234-.225.366-.53.366-.85V5L9.875 2Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9 2v2.667A1.333 1.333 0 0 0 10.333 6H13"/></svg>+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M9 2V4.24394C9 4.5622 9.12643 4.86743 9.35147 5.09247C9.57652 5.31751 9.88174 5.44394 10.2 5.44394H12.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/assets/icons/file_code.svg b/assets/icons/file_code.svgindex 548d5a153ba..b07f1c36ebc 100644--- a/assets/icons/file_code.svg+++ b/assets/icons/file_code.svg@@ -1 +1,4 @@-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.3 5.6 9.8l1.2 1.5M9.2 8.3l1.2 1.5-1.2 1.5M9.2 2v2.4a1.2 1.2 0 0 0 1.2 1.2h2.4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3Z"/></svg>+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M6.80001 6.5L5.60001 8L6.80001 9.5M9.20001 6.5L10.4 8L9.20001 9.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/assets/icons/file_diff.svg b/assets/icons/file_diff.svgindex 193dd7392ff..010a68b4ec6 100644--- a/assets/icons/file_diff.svg+++ b/assets/icons/file_diff.svg@@ -1 +1,4 @@-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3ZM6.2 6.8h3.6M8 8.6V5M6.2 11h3.6"/></svg>+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M6.35106 7.02662H9.64893M7.99999 8.67555V5.37769M6.35106 10.8741H9.64893" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/assets/icons/file_ignored.svg b/assets/icons/file_ignored.svgindex 2c3228c6ade..e15bf125db9 100644--- a/assets/icons/file_ignored.svg+++ b/assets/icons/file_ignored.svg@@ -1,5 +1,5 @@<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M1.24139 2.86957L14.7586 13.1304" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M3.5 7.63104V12.8C3.5 13.1182 3.61853 13.4235 3.8295 13.6485C4.04048 13.8735 4.32663 14 4.625 14H11.0079" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M4.625 2H8.60442C9.29544 2 9.95564 2.28602 10.4283 2.79015L11.8238 4.27877C12.2582 4.74213 12.5 5.35347 12.5 5.98862V7.97886" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M1.91129 3.37805L14.0887 12.6219" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M3.94603 7.6676V12.3242C3.94603 12.6109 4.05281 12.8859 4.24288 13.0886C4.43294 13.2914 4.69073 13.4053 4.95952 13.4053H10.7097" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M4.95952 2.59473H8.54451C9.16704 2.59473 9.76181 2.8524 10.1876 3.30656L11.4448 4.64763C11.8362 5.06507 12.054 5.61581 12.054 6.18801V7.98098" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/></svg>diff --git a/assets/icons/file_text_filled.svg b/assets/icons/file_text_filled.svgindex 15c81cca620..8aff5512de8 100644--- a/assets/icons/file_text_filled.svg+++ b/assets/icons/file_text_filled.svg@@ -1,3 +1,3 @@<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M9.875 1.25C10.0686 1.25 10.2549 1.3249 10.3945 1.45898L13.5195 4.45898C13.6668 4.60041 13.75 4.79582 13.75 5V12.7998C13.75 13.327 13.5316 13.8263 13.1533 14.1895C12.7762 14.5515 12.2709 14.75 11.75 14.75H4.25C3.72915 14.75 3.22383 14.5515 2.84668 14.1895C2.46849 13.8264 2.25 13.3271 2.25 12.7998V3.2002C2.25 2.67294 2.46848 2.17365 2.84668 1.81055C3.22388 1.44843 3.72922 1.25 4.25 1.25H9.875ZM5.73242 9.9707C5.31832 9.97084 4.98242 10.3066 4.98242 10.7207C4.98242 11.1348 5.31832 11.4706 5.73242 11.4707H10.2666C10.6808 11.4707 11.0166 11.1349 11.0166 10.7207C11.0166 10.3065 10.6808 9.9707 10.2666 9.9707H5.73242ZM5.73242 7.75C5.31832 7.75013 4.98242 8.08587 4.98242 8.5C4.98242 8.91413 5.31832 9.24987 5.73242 9.25H8.45312C8.86734 9.25 9.20312 8.91421 9.20312 8.5C9.20312 8.08579 8.86734 7.75 8.45312 7.75H5.73242Z" fill="black"/>+<path d="M9.875 1.25C10.0686 1.25 10.2549 1.3249 10.3945 1.45898L13.5195 4.45898C13.6668 4.60041 13.75 4.79582 13.75 5V12.7998C13.75 13.327 13.5316 13.8263 13.1533 14.1895C12.7762 14.5515 12.2709 14.75 11.75 14.75H4.25C3.72915 14.75 3.22383 14.5515 2.84668 14.1895C2.46849 13.8264 2.25 13.3271 2.25 12.7998V3.2002C2.25 2.67294 2.46848 2.17365 2.84668 1.81055C3.22388 1.44843 3.72922 1.25 4.25 1.25H9.875ZM5.73242 9.9707C5.31832 9.97084 4.98242 10.3066 4.98242 10.7207C4.98242 11.1348 5.31832 11.4706 5.73242 11.4707H10.2666C10.6808 11.4707 11.0166 11.1349 11.0166 10.7207C11.0166 10.3065 10.6808 9.9707 10.2666 9.9707H5.73242ZM5.73242 7.75C5.31832 7.75013 4.98242 8.08587 4.98242 8.5C4.98242 8.91413 5.31832 9.24987 5.73242 9.25H8.45312C8.86734 9.25 9.20312 8.91421 9.20312 8.5C9.20312 8.08579 8.86734 7.75 8.45312 7.75H5.73242Z" fill="#DCE0E5"/></svg>diff --git a/assets/icons/file_text_outlined.svg b/assets/icons/file_text_outlined.svgindex d2e8897251e..f602bd0492e 100644--- a/assets/icons/file_text_outlined.svg+++ b/assets/icons/file_text_outlined.svg@@ -1,6 +1,6 @@<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M9.87504 2H4.25001C3.91848 2 3.60055 2.12643 3.36612 2.35148C3.1317 2.57652 3 2.88174 3 3.2V12.8C3 13.1182 3.1317 13.4234 3.36612 13.6485C3.60055 13.8735 3.91848 14 4.25001 14H11.75C12.0816 14 12.3995 13.8735 12.6339 13.6485C12.8683 13.4234 13 13.1182 13 12.8V5L9.87504 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M9 2V4.66666C9 5.02029 9.14048 5.35942 9.39053 5.60948C9.64059 5.85952 9.97972 6 10.3333 6H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M8.4534 8.5H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M10.2672 10.7207H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M9 2V4.24394C9 4.5622 9.12643 4.86743 9.35147 5.09247C9.57652 5.31751 9.88174 5.44394 10.2 5.44394H12.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M8.4534 8.5H5.73267" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M10.2672 10.7207H5.73267" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/></svg>diff --git a/assets/icons/filter.svg b/assets/icons/filter.svgindex 4aa14e93c00..20a6a367dc4 100644--- a/assets/icons/filter.svg+++ b/assets/icons/filter.svg@@ -1,3 +1,8 @@<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M12.9416 2.99643C13.08 2.79636 12.9568 2.5 12.7352 2.5H3.26475C3.04317 2.5 2.91999 2.79636 3.0584 2.99643L6.04033 7.30646C6.24713 7.60535 6.35981 7.97674 6.35981 8.3596C6.35981 9.18422 6.35981 11.4639 6.35981 12.891C6.35981 13.2285 6.59643 13.5 6.88831 13.5H9.11168C9.40357 13.5 9.64019 13.2285 9.64019 12.891C9.64019 11.4639 9.64019 9.18422 9.64019 8.3596C9.64019 7.97674 9.75289 7.60535 9.95969 7.30646L12.9416 2.99643Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>+<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>+<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>+<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>+<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>+<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/></svg>diff --git a/assets/icons/list_filter.svg b/assets/icons/list_filter.svgdeleted file mode 100644index fc3885437da..00000000000--- a/assets/icons/list_filter.svg+++ /dev/null@@ -1,5 +0,0 @@-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M2 4H14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M4.66666 8H11.3333" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-<path d="M6.66666 12H9.33332" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>-</svg>diff --git a/assets/icons/on_call.svg b/assets/icons/on_call.svgnew file mode 100644index 00000000000..66e5d71304f--- /dev/null+++ b/assets/icons/on_call.svg@@ -0,0 +1,5 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M9.23593 2.55334C10.3635 2.55334 11.4448 3.00126 12.2421 3.79854C13.0394 4.59583 13.4873 5.67718 13.4873 6.80472" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M9.23593 4.44281C9.86234 4.44281 10.4631 4.69165 10.906 5.13459C11.349 5.57752 11.5978 6.17828 11.5978 6.80468" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M8.97096 10.421C9.08042 10.4713 9.20373 10.4828 9.32059 10.4536C9.43745 10.4244 9.54088 10.3563 9.61385 10.2604L9.802 10.014C9.90073 9.88235 10.0288 9.7755 10.1759 9.7019C10.3231 9.62831 10.4854 9.59 10.65 9.59H12.24C12.5211 9.59 12.7907 9.70167 12.9895 9.90046C13.1883 10.0993 13.3 10.3689 13.3 10.65V12.24C13.3 12.5211 13.1883 12.7907 12.9895 12.9895C12.7907 13.1883 12.5211 13.3 12.24 13.3C9.70983 13.3 7.2833 12.2949 5.49421 10.5058C3.70511 8.7167 2.70001 6.29017 2.70001 3.76001C2.70001 3.47888 2.81169 3.20927 3.01048 3.01048C3.20927 2.81169 3.47888 2.70001 3.76001 2.70001H5.35001C5.63113 2.70001 5.90075 2.81169 6.09954 3.01048C6.29833 3.20927 6.41 3.47888 6.41 3.76001V5.35001C6.41 5.51457 6.37169 5.67687 6.2981 5.82405C6.2245 5.97124 6.11765 6.09927 5.986 6.198L5.73797 6.38403C5.64067 6.45833 5.57209 6.56401 5.54387 6.68314C5.51566 6.80226 5.52956 6.92748 5.58321 7.03752C6.30754 8.50873 7.49885 9.69854 8.97096 10.421Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/assets/icons/sliders.svg b/assets/icons/sliders.svgdeleted file mode 100644index 20a6a367dc4..00000000000--- a/assets/icons/sliders.svg+++ /dev/null@@ -1,8 +0,0 @@-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>-<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>-<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>-<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>-</svg>diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rsindex 6a0a32c3933..f9baa1d475a 100644--- a/crates/collab_ui/src/collab_panel.rs+++ b/crates/collab_ui/src/collab_panel.rs@@ -2964,8 +2964,9 @@ impl CollabPanel {Section::Channels => {Some(h_flex()+ .gap_px().child(- IconButton::new("filter-occupied-channels", IconName::ListFilter)+ IconButton::new("filter-occupied-channels", IconName::OnCall).icon_size(IconSize::Small).toggle_state(self.filter_occupied_channels).on_click(cx.listener(|this, _, _window, cx| {diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rsindex c034363bcd9..aa1bd4455c6 100644--- a/crates/debugger_ui/src/debugger_panel.rs+++ b/crates/debugger_ui/src/debugger_panel.rs@@ -33,7 +33,8 @@ use std::sync::{Arc, LazyLock};use task::{DebugScenario, SharedTaskContext};use tree_sitter::{Query, StreamingIterator as _};use ui::{- ContextMenu, Divider, PopoverMenu, PopoverMenuHandle, SplitButton, Tab, Tooltip, prelude::*,+ ButtonLike, ContextMenu, Divider, ElevationIndex, PopoverMenu, PopoverMenuHandle, SplitButton,+ Tab, TintColor, Tooltip, prelude::*,};use util::redact::redact_command;use util::rel_path::RelPath;@@ -731,11 +732,11 @@ impl DebugPanel {IconName::DebugContinue,).icon_size(IconSize::Small)+ .disabled(thread_status != ThreadStatus::Stopped).on_click(window.listener_for(running_state,|this, _, _window, cx| this.continue_thread(cx),))- .disabled(thread_status != ThreadStatus::Stopped).tooltip({let focus_handle = focus_handle.clone();move |_window, cx| {@@ -953,28 +954,26 @@ impl DebugPanel {.map(|session| session.read(cx).running_state()).cloned(),|this, running_state| {- this.children({- let threads =- running_state.update(cx, |running_state, cx| {- let session = running_state.session();- session.read(cx).is_started().then(|| {- session.update(cx, |session, cx| {- session.threads(cx)- })- })- });-- threads.and_then(|threads| {- self.render_thread_dropdown(- &running_state,- threads,- window,- cx,- )+ let threads = running_state.update(cx, |running_state, cx| {+ let session = running_state.session();+ session.read(cx).is_started().then(|| {+ session.update(cx, |session, cx| session.threads(cx))+ })+ });++ let thread_dropdown = threads.and_then(|threads| {+ self.render_thread_dropdown(+ &running_state,+ threads,+ window,+ cx,+ )+ });++ this.when_some(thread_dropdown, |this, dropdown| {+ this.child(dropdown).when(!is_side, |this| {+ this.gap_0p5().child(Divider::vertical())})- })- .when(!is_side, |this| {- this.gap_0p5().child(Divider::vertical())})},),@@ -1351,9 +1350,14 @@ impl DebugPanel {running_state: &Entity<RunningState>,thread_status: ThreadStatus,window: &mut Window,- ) -> IconButton {- IconButton::new("debug-back-in-history", IconName::HistoryRerun)- .icon_size(IconSize::Small)+ ) -> ButtonLike {+ ButtonLike::new_rounded_left("debug-back-in-history")+ .layer(ElevationIndex::ModalSurface)+ .child(Icon::new(IconName::HistoryRerun).size(IconSize::Small))+ .disabled(+ thread_status == ThreadStatus::Running || thread_status == ThreadStatus::Stepping,+ )+ .tooltip(Tooltip::text("Step Back in Session History")).on_click(window.listener_for(running_state, |this, _, _window, cx| {this.session().update(cx, |session, cx| {let ix = session@@ -1363,9 +1367,6 @@ impl DebugPanel {session.select_historic_snapshot(Some(ix.saturating_sub(1)), cx);})}))- .disabled(- thread_status == ThreadStatus::Running || thread_status == ThreadStatus::Stepping,- )}fn render_history_toggle_button(@@ -1373,20 +1374,19 @@ impl DebugPanel {thread_status: ThreadStatus,running_state: &Entity<RunningState>,) -> impl IntoElement {+ let chevron_button_size = rems_from_px(20.);PopoverMenu::new("debug-back-in-history-menu").trigger(- ui::ButtonLike::new_rounded_right("debug-back-in-history-menu-trigger")- .layer(ui::ElevationIndex::ModalSurface)- .size(ui::ButtonSize::None)- .child(- div()- .px_1()- .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),- )+ ButtonLike::new_rounded_right("debug-back-in-history-menu-trigger")+ .layer(ElevationIndex::ModalSurface)+ .selected_style(ButtonStyle::Tinted(TintColor::Accent)).disabled(thread_status == ThreadStatus::Running|| thread_status == ThreadStatus::Stepping,- ),+ )+ .width(chevron_button_size)+ .height(chevron_button_size.into())+ .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),).menu({let running_state = running_state.clone();@@ -1417,7 +1417,10 @@ impl DebugPanel {handler(None, running_state.clone(), cx);}});- context_menu = context_menu.separator();++ if !history.is_empty() {+ context_menu = context_menu.separator();+ }for (ix, _) in history.iter().enumerate().rev() {context_menu =@@ -1935,9 +1938,9 @@ impl Render for DebugPanel {h_flex().size_full().child(breakpoint_list)- .child(Divider::vertical())+ .child(Divider::vertical().h_full()).child(welcome_experience)- .child(Divider::vertical()),+ .child(Divider::vertical().h_full()),)} else {this.child(diff --git a/crates/debugger_ui/src/dropdown_menus.rs b/crates/debugger_ui/src/dropdown_menus.rsindex 0e07cb8841b..1fb7f901540 100644--- a/crates/debugger_ui/src/dropdown_menus.rs+++ b/crates/debugger_ui/src/dropdown_menus.rs@@ -3,7 +3,7 @@ use std::rc::Rc;use collections::HashMap;use gpui::{Anchor, Entity, WeakEntity};use project::debugger::session::{ThreadId, ThreadStatus};-use ui::{CommonAnimationExt, ContextMenu, DropdownMenu, DropdownStyle, Indicator, prelude::*};+use ui::{CommonAnimationExt, ContextMenu, DropdownMenu, Indicator, Tooltip, prelude::*};use util::{maybe, truncate_and_trailoff};use crate::{@@ -132,7 +132,7 @@ impl DebugPanel {let session_state_indicator = if is_terminated {Indicator::dot().color(Color::Error).into_any_element()} else if !is_started {- Icon::new(IconName::ArrowCircle)+ Icon::new(IconName::LoadCircle).size(IconSize::Small).color(Color::Muted).with_rotate_animation(2)@@ -147,7 +147,6 @@ impl DebugPanel {let trigger = h_flex().gap_2().child(session_state_indicator)- .justify_between().child(DebugPanel::dropdown_label(trigger_label).when(is_terminated, |this| this.strikethrough()),@@ -212,8 +211,8 @@ impl DebugPanel {}),).attach(Anchor::BottomLeft)- .style(DropdownStyle::Ghost)- .handle(self.session_picker_menu_handle.clone());+ .handle(self.session_picker_menu_handle.clone())+ .trigger_tooltip(Tooltip::text("Select a Debug Session"));Some(menu)}@@ -325,7 +324,6 @@ impl DebugPanel {).attach(Anchor::BottomLeft).disabled(session_terminated)- .style(DropdownStyle::Ghost).handle(self.thread_picker_menu_handle.clone()),)} else {diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rsindex 7282e5160d7..6e68dfe5ba8 100644--- a/crates/debugger_ui/src/persistence.rs+++ b/crates/debugger_ui/src/persistence.rs@@ -70,23 +70,23 @@ impl DebuggerPaneItem {pub(crate) fn tab_tooltip(self) -> SharedString {let tooltip = match self {DebuggerPaneItem::Console => {- "Displays program output and allows manual input of debugger commands."+ "Displays program output and allows manual input of debugger commands"}DebuggerPaneItem::Variables => {- "Shows current values of local and global variables in the current stack frame."+ "Shows current values of local and global variables in the current stack frame"}- DebuggerPaneItem::BreakpointList => "Lists all active breakpoints set in the code.",+ DebuggerPaneItem::BreakpointList => "Lists all active breakpoints set in the code",DebuggerPaneItem::Frames => {- "Displays the call stack, letting you navigate between function calls."+ "Displays the call stack, letting you navigate between function calls"}- DebuggerPaneItem::Modules => "Shows all modules or libraries loaded by the program.",+ DebuggerPaneItem::Modules => "Shows all modules or libraries loaded by the program",DebuggerPaneItem::LoadedSources => {- "Lists all source files currently loaded and used by the debugger."+ "Lists all source files currently loaded and used by the debugger"}DebuggerPaneItem::Terminal => {- "Provides an interactive terminal session within the debugging environment."+ "Provides an interactive terminal session within the debugging environment"}- DebuggerPaneItem::MemoryView => "Allows inspection of memory contents.",+ DebuggerPaneItem::MemoryView => "Allows inspection of memory contents",};SharedString::new_static(tooltip)}diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rsindex a964eb389f6..bce007f8b0a 100644--- a/crates/debugger_ui/src/session/running.rs+++ b/crates/debugger_ui/src/session/running.rs@@ -382,20 +382,232 @@ impl Render for SubView {"subview-container-{}",self.kind.to_shared_string()))- .on_hover(cx.listener(|this, hovered, _, cx| {- this.hovered = *hovered;- cx.notify();- })).size_full()- // Add border unconditionally to prevent layout shifts on focus changes..border_1().when(self.item_focus_handle.contains_focused(window, cx), |el| {el.border_color(cx.theme().colors().pane_focused_border)}).child(self.inner.clone())+ .on_hover(cx.listener(|this, hovered, _, cx| {+ this.hovered = *hovered;+ cx.notify();+ }))}}+struct DraggedTabPreview {+ label: SharedString,+}++impl Render for DraggedTabPreview {+ fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {+ let ui_font = theme_settings::ThemeSettings::get_global(cx)+ .ui_font+ .clone();+ let colors = cx.theme().colors();++ h_flex()+ .font(ui_font)+ .h_6()+ .px_1()+ .rounded_sm()+ .shadow_md()+ .border_1()+ .border_color(colors.border)+ .bg(colors.elevated_surface_background)+ .child(Label::new(self.label.clone()).size(LabelSize::Small))+ }+}++fn render_debugger_tab(+ ix: usize,+ item: &dyn ItemHandle,+ selected: bool,+ deemphasized: bool,+ window: &mut Window,+ cx: &mut Context<Pane>,+) -> impl IntoElement + use<> {+ let item_ = item.boxed_clone();+ let colors = cx.theme().colors();++ div()+ .border_l_2()+ .border_color(gpui::transparent_black())+ .drag_over::<DraggedTab>(|wrapper, _, _, cx| wrapper.border_color(cx.theme().colors().text))+ .child(+ div()+ .cursor_pointer()+ .id(format!("debugger_tab_{}", item.item_id().as_u64()))+ .p_1()+ .rounded_sm()+ .map(|s| {+ if selected {+ s.bg(colors.text_accent.opacity(0.08))+ .hover(|s| s.bg(colors.text_accent.opacity(0.25)))+ .text_color(colors.text_accent)+ } else {+ s.hover(|s| s.bg(colors.element_hover))+ }+ })+ .when(deemphasized, |s| s.opacity(0.8))+ .child(item.tab_content(+ TabContentParams {+ selected,+ deemphasized,+ ..Default::default()+ },+ window,+ cx,+ ))+ .when_some(item.tab_tooltip_text(cx), |this, tooltip| {+ this.tooltip(Tooltip::text(tooltip))+ })+ .on_click(cx.listener(move |this, _, window, cx| {+ let index = this.index_for_item(&*item_);+ if let Some(index) = index {+ this.activate_item(index, true, true, window, cx);+ }+ }))+ .on_drop(+ cx.listener(move |this, dragged_tab: &DraggedTab, window, cx| {+ if dragged_tab.item.downcast::<SubView>().is_none() {+ return;+ }+ this.drag_split_direction = None;+ this.handle_tab_drop(dragged_tab, ix, false, window, cx)+ }),+ )+ .on_drag(+ DraggedTab {+ item: item.boxed_clone(),+ pane: cx.entity(),+ detail: 0,+ is_active: selected,+ ix,+ },+ |tab, _, _, cx| {+ let label = tab.item.tab_content_text(0, cx);+ cx.new(|_| DraggedTabPreview { label })+ },+ ),+ )+}++fn render_debugger_tab_bar(+ pane: &mut Pane,+ focus_handle: &FocusHandle,+ window: &mut Window,+ cx: &mut Context<Pane>,+) -> gpui::AnyElement {+ let active_pane_item = pane.active_item();+ let pane_group_id: SharedString = format!("pane-zoom-button-hover-{}", cx.entity_id()).into();+ let as_subview = active_pane_item+ .as_ref()+ .and_then(|item| item.downcast::<SubView>());++ let is_hovered = as_subview+ .as_ref()+ .is_some_and(|item| item.read(cx).hovered);+ let deemphasized = !pane.has_focus(window, cx);++ let tabs = pane+ .items()+ .enumerate()+ .map(|(ix, item)| {+ let selected = active_pane_item+ .as_ref()+ .is_some_and(|active| active.item_id() == item.item_id());+ render_debugger_tab(ix, item.as_ref(), selected, deemphasized, window, cx)+ })+ .collect::<Vec<_>>();++ h_flex()+ .track_focus(focus_handle)+ .group(pane_group_id.clone())+ .on_action(|_: &menu::Cancel, window, cx| {+ if cx.stop_active_drag(window) {+ } else {+ cx.propagate();+ }+ })+ .pl_1p5()+ .pr_1()+ .justify_between()+ .border_b_1()+ .border_color(cx.theme().colors().border)+ .bg(cx.theme().colors().tab_bar_background)+ .child(+ h_flex()+ .w_full()+ .gap_1()+ .h(Tab::container_height(cx))+ .children(tabs)+ .on_drop(+ cx.listener(move |this, dragged_tab: &DraggedTab, window, cx| {+ if dragged_tab.item.downcast::<SubView>().is_none() {+ return;+ }+ this.drag_split_direction = None;+ this.handle_tab_drop(dragged_tab, this.items_len(), false, window, cx)+ }),+ )+ .child(+ div()+ .flex_1()+ .h_6()+ .border_l_2()+ .border_color(gpui::transparent_black())+ .drag_over::<DraggedTab>(|spacer, _, _, cx| {+ spacer.border_color(cx.theme().colors().text)+ }),+ ),+ )+ .child({+ let zoomed = pane.is_zoomed();++ h_flex()+ .visible_on_hover(pane_group_id)+ .when(is_hovered, |this| this.visible())+ .when_some(as_subview.as_ref(), |this, subview| {+ subview.update(cx, |view, cx| {+ let Some(additional_actions) = view.actions.as_mut() else {+ return this;+ };+ this.child(additional_actions(window, cx))+ })+ })+ .child(+ IconButton::new(+ format!("debug-toggle-zoom-{}", cx.entity_id()),+ if zoomed {+ IconName::Minimize+ } else {+ IconName::Maximize+ },+ )+ .icon_size(IconSize::Small)+ .on_click(cx.listener(move |pane, _, _, cx| {+ let is_zoomed = pane.is_zoomed();+ pane.set_zoomed(!is_zoomed, cx);+ cx.notify();+ }))+ .tooltip({+ let focus_handle = focus_handle.clone();+ move |_window, cx| {+ let zoomed_text = if zoomed { "Minimize" } else { "Expand" };+ Tooltip::for_action_in(+ zoomed_text,+ &ToggleExpandItem,+ &focus_handle,+ cx,+ )+ }+ }),+ )+ })+ .into_any_element()+}+pub(crate) fn new_debugger_pane(workspace: WeakEntity<Workspace>,project: Entity<Project>,@@ -456,169 +668,7 @@ pub(crate) fn new_debugger_pane(pane.set_should_display_tab_bar(|_, _| true);pane.set_render_tab_bar_buttons(cx, |_, _, _| (None, None));pane.set_render_tab_bar(cx, {- move |pane, window, cx| {- let active_pane_item = pane.active_item();- let pane_group_id: SharedString =- format!("pane-zoom-button-hover-{}", cx.entity_id()).into();- let as_subview = active_pane_item- .as_ref()- .and_then(|item| item.downcast::<SubView>());- let is_hovered = as_subview- .as_ref()- .is_some_and(|item| item.read(cx).hovered);-- h_flex()- .track_focus(&focus_handle)- .group(pane_group_id.clone())- .pl_1p5()- .pr_1()- .justify_between()- .border_b_1()- .border_color(cx.theme().colors().border)- .bg(cx.theme().colors().tab_bar_background)- .on_action(|_: &menu::Cancel, window, cx| {- if cx.stop_active_drag(window) {- } else {- cx.propagate();- }- })- .child(- h_flex()- .w_full()- .gap_1()- .h(Tab::container_height(cx))- .drag_over::<DraggedTab>(|bar, _, _, cx| {- bar.bg(cx.theme().colors().drop_target_background)- })- .on_drop(cx.listener(- move |this, dragged_tab: &DraggedTab, window, cx| {- if dragged_tab.item.downcast::<SubView>().is_none() {- return;- }- this.drag_split_direction = None;- this.handle_tab_drop(- dragged_tab,- this.items_len(),- false,- window,- cx,- )- },- ))- .children(pane.items().enumerate().map(|(ix, item)| {- let selected = active_pane_item- .as_ref()- .is_some_and(|active| active.item_id() == item.item_id());- let deemphasized = !pane.has_focus(window, cx);- let item_ = item.boxed_clone();- div()- .id(format!("debugger_tab_{}", item.item_id().as_u64()))- .p_1()- .rounded_md()- .cursor_pointer()- .when_some(item.tab_tooltip_text(cx), |this, tooltip| {- this.tooltip(Tooltip::text(tooltip))- })- .map(|this| {- let theme = cx.theme();- if selected {- let color = theme.colors().tab_active_background;- let color = if deemphasized {- color.opacity(0.5)- } else {- color- };- this.bg(color)- } else {- let hover_color = theme.colors().element_hover;- this.hover(|style| style.bg(hover_color))- }- })- .on_click(cx.listener(move |this, _, window, cx| {- let index = this.index_for_item(&*item_);- if let Some(index) = index {- this.activate_item(index, true, true, window, cx);- }- }))- .child(item.tab_content(- TabContentParams {- selected,- deemphasized,- ..Default::default()- },- window,- cx,- ))- .on_drop(cx.listener(- move |this, dragged_tab: &DraggedTab, window, cx| {- if dragged_tab.item.downcast::<SubView>().is_none() {- return;- }- this.drag_split_direction = None;- this.handle_tab_drop(dragged_tab, ix, false, window, cx)- },- ))- .on_drag(- DraggedTab {- item: item.boxed_clone(),- pane: cx.entity(),- detail: 0,- is_active: selected,- ix,- },- |tab, _, _, cx| cx.new(|_| tab.clone()),- )- })),- )- .child({- let zoomed = pane.is_zoomed();-- h_flex()- .visible_on_hover(pane_group_id)- .when(is_hovered, |this| this.visible())- .when_some(as_subview.as_ref(), |this, subview| {- subview.update(cx, |view, cx| {- let Some(additional_actions) = view.actions.as_mut() else {- return this;- };- this.child(additional_actions(window, cx))- })- })- .child(- IconButton::new(- SharedString::from(format!(- "debug-toggle-zoom-{}",- cx.entity_id()- )),- if zoomed {- IconName::Minimize- } else {- IconName::Maximize- },- )- .icon_size(IconSize::Small)- .on_click(cx.listener(move |pane, _, _, cx| {- let is_zoomed = pane.is_zoomed();- pane.set_zoomed(!is_zoomed, cx);- cx.notify();- }))- .tooltip({- let focus_handle = focus_handle.clone();- move |_window, cx| {- let zoomed_text =- if zoomed { "Minimize" } else { "Expand" };- Tooltip::for_action_in(- zoomed_text,- &ToggleExpandItem,- &focus_handle,- cx,- )- }- }),- )- })- .into_any_element()- }+ move |pane, window, cx| render_debugger_tab_bar(pane, &focus_handle, window, cx)});pane})diff --git a/crates/debugger_ui/src/session/running/memory_view.rs b/crates/debugger_ui/src/session/running/memory_view.rsindex a344a92eadd..90fd5964d00 100644--- a/crates/debugger_ui/src/session/running/memory_view.rs+++ b/crates/debugger_ui/src/session/running/memory_view.rs@@ -19,8 +19,8 @@ use project::debugger::{MemoryCell, dap_command::DataBreakpointContext, session:use settings::Settings;use theme_settings::ThemeSettings;use ui::{- ContextMenu, Divider, DropdownMenu, FluentBuilder, IntoElement, PopoverMenuHandle, Render,- ScrollableHandle, StatefulInteractiveElement, Tooltip, WithScrollbar, prelude::*,+ ContextMenu, Divider, DropdownMenu, PopoverMenuHandle, ScrollableHandle,+ StatefulInteractiveElement, Tooltip, WithScrollbar, prelude::*,};use workspace::Workspace;@@ -368,7 +368,9 @@ impl MemoryView {this}),)+ .style(ui::DropdownStyle::Outlined).handle(self.width_picker_handle.clone())+ .attach(gpui::Anchor::BottomLeft)}fn page_down(&mut self, _: &menu::SelectLast, _: &mut Window, cx: &mut Context<Self>) {@@ -846,19 +848,16 @@ fn render_single_memory_view_line(}impl Render for MemoryView {- fn render(- &mut self,- window: &mut ui::Window,- cx: &mut ui::Context<Self>,- ) -> impl ui::IntoElement {+ fn render(&mut self, window: &mut ui::Window, cx: &mut ui::Context<Self>) -> impl IntoElement {let (icon, tooltip_text) = if self.is_writing_memory {- (IconName::Pencil, "Edit memory at a selected address")+ (IconName::Pencil, "Edit Memory at a Selected Address")} else {(IconName::LocationEdit,- "Change address of currently viewed memory",+ "Change Address of Currently Viewed Memory",)};+v_flex().id("Memory-view").on_action(cx.listener(Self::cancel))@@ -873,31 +872,31 @@ impl Render for MemoryView {.child(h_flex().w_full()- .mb_0p5()+ .mb_1().gap_1().child(h_flex()+ .px_1()+ .h_6().w_full()- .rounded_md()+ .rounded_sm()+ .gap_1().border_1()- .gap_x_2()- .px_2()- .py_0p5()- .mb_0p5()- .bg(cx.theme().colors().editor_background).when_else(self.query_editor.focus_handle(cx).contains_focused(window, cx),|this| this.border_color(cx.theme().colors().border_focused),- |this| this.border_color(cx.theme().colors().border_transparent),+ |this| this.border_color(cx.theme().colors().border_variant),)+ .bg(cx.theme().colors().editor_background).child(div().id("memory-view-editor-icon").child(Icon::new(icon).size(ui::IconSize::XSmall)).tooltip(Tooltip::text(tooltip_text)),)+ .child(Divider::vertical()).child(self.render_query_bar(cx)),).child(self.render_width_picker(window, cx)),diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rsindex 982fc0f8567..ea8192ebb80 100644--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs@@ -911,7 +911,7 @@ impl StackFrameList {.child(IconButton::new("filter-by-visible-worktree-stack-frame-list",- IconName::ListFilter,+ IconName::Filter,).tooltip(move |_window, cx| {Tooltip::for_action(tooltip_title, &ToggleUserFrames, cx)diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rsindex 9cc86df9a73..94b5a2e49ec 100644--- a/crates/git_ui/src/branch_picker.rs+++ b/crates/git_ui/src/branch_picker.rs@@ -1252,7 +1252,7 @@ impl PickerDelegate for BranchListDelegate {.log_err();})).trigger(- IconButton::new("branch-filter", IconName::ListFilter)+ IconButton::new("branch-filter", IconName::Filter).toggle_state(branch_filter != BranchFilter::All).when(branch_filter != BranchFilter::All, |this| {this.indicator(Indicator::dot().color(Color::Info))diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rsindex 53dbe3e74bc..85465f98cb4 100644--- a/crates/git_ui/src/git_panel.rs+++ b/crates/git_ui/src/git_panel.rs@@ -5091,7 +5091,7 @@ impl GitPanel {PopoverMenu::new(id.into()).trigger_with_tooltip(- IconButton::new("view-options-menu-trigger", IconName::Sliders)+ IconButton::new("view-options-menu-trigger", IconName::Filter).icon_size(IconSize::Small),Tooltip::text("View Options"),)diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rsindex e0c5e623ab5..5633371f5b2 100644--- a/crates/gpui/src/elements/div.rs+++ b/crates/gpui/src/elements/div.rs@@ -2223,6 +2223,7 @@ impl Interactivity {|| self.has_pinch_listeners()|| self.drag_listener.is_some()|| !self.drop_listeners.is_empty()+ || !self.drag_over_styles.is_empty()|| self.tooltip_builder.is_some()|| window.is_inspector_picking(cx)}diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rsindex 3f015608b39..6a94f8c7b46 100644--- a/crates/icons/src/icons.rs+++ b/crates/icons/src/icons.rs@@ -180,7 +180,6 @@ pub enum IconName {Link,Linux,ListCollapse,- ListFilter,ListTodo,ListTree,ListX,@@ -196,6 +195,7 @@ pub enum IconName {MicMute,Minimize,Notepad,+ OnCall,Option,PageDown,PageUp,@@ -236,7 +236,6 @@ pub enum IconName {SignalLow,SignalMedium,Slash,- Sliders,Sourcehut,Space,Sparkle,diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rsindex db405135994..44d53453ba5 100644--- a/crates/keymap_editor/src/keymap_editor.rs+++ b/crates/keymap_editor/src/keymap_editor.rs@@ -1678,7 +1678,7 @@ impl KeymapEditor {y: px(2.0),}).trigger_with_tooltip(- IconButton::new("KeymapEditorFilterMenuButton", IconName::Sliders)+ IconButton::new("KeymapEditorFilterMenuButton", IconName::Filter).icon_size(IconSize::Small).when(self.keybinding_conflict_state.any_user_binding_conflicts(),@@ -1701,7 +1701,7 @@ impl KeymapEditor {menu.toggleable_entry(name,toggled,- IconPosition::End,+ IconPosition::Start,action.as_ref().map(|a| a.boxed_clone()),move |window, cx| {window.focus(&focus_handle, cx);@@ -2018,7 +2018,6 @@ impl Render for KeymapEditor {.child(h_flex().gap_2()- .items_center().child(h_flex().key_context({@@ -2029,9 +2028,7 @@ impl Render for KeymapEditor {.flex_1().min_w_0().h_8()- .pl_2()- .pr_1()- .py_1()+ .px_2().border_1().border_color(theme.colors().border).rounded_md()@@ -2041,7 +2038,9 @@ impl Render for KeymapEditor {h_flex().gap_1().flex_none()- .items_center()+ // Make sure this min-width value aligns with the spacer+ // div in the keystroke search input+ .min_w_80().child(IconButton::new("KeymapEditorKeystrokeSearchButton",@@ -2075,7 +2074,6 @@ impl Render for KeymapEditor {).child(Button::new("edit-in-json", "Edit in JSON")- .style(ButtonStyle::Subtle).key_binding(ui::KeyBinding::for_action_in(&zed_actions::OpenKeymapFile, &focus_handle, cx).map(|kb| kb.size(rems_from_px(10.))),@@ -2110,7 +2108,7 @@ impl Render for KeymapEditor {h_flex().gap_2().child(self.keystroke_editor.clone())- .child(div().min_w_96()), // Spacer div to align with the search input+ .child(div().min_w_80()), // Spacer div to align with the search input)},),diff --git a/crates/language_tools/src/highlights_tree_view.rs b/crates/language_tools/src/highlights_tree_view.rsindex 1b58e830153..e63f6e3051c 100644--- a/crates/language_tools/src/highlights_tree_view.rs+++ b/crates/language_tools/src/highlights_tree_view.rs@@ -14,10 +14,9 @@ use std::{mem, ops::Range, sync::Arc, time::Duration};use theme::ActiveTheme;use theme::SyntaxTheme;use ui::{- ButtonCommon, ButtonLike, ButtonStyle, Color, ContextMenu, FluentBuilder as _, IconButton,- IconName, IconPosition, IconSize, Label, LabelCommon, LabelSize, PopoverMenu,- PopoverMenuHandle, StyledExt, Toggleable, Tooltip, WithScrollbar, h_flex, v_flex,+ ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip, WithScrollbar, prelude::*,};+use workspace::{Event as WorkspaceEvent, SplitDirection, ToolbarItemEvent, ToolbarItemLocation,ToolbarItemView, Workspace,@@ -983,9 +982,8 @@ impl HighlightsTreeToolbarItemView {PopoverMenu::new("highlights-tree-settings").trigger_with_tooltip(- IconButton::new("toggle-highlights-settings-icon", IconName::Sliders)+ IconButton::new("toggle-highlights-settings-icon", IconName::Filter).icon_size(IconSize::Small)- .style(ButtonStyle::Subtle).toggle_state(self.toggle_settings_handle.is_deployed()),Tooltip::text("Highlights Settings"),)diff --git a/crates/ui/src/components/button/split_button.rs b/crates/ui/src/components/button/split_button.rsindex 315bbc95f12..0173474690d 100644--- a/crates/ui/src/components/button/split_button.rs+++ b/crates/ui/src/components/button/split_button.rs@@ -68,12 +68,12 @@ impl RenderOnce for SplitButton {SplitButtonStyle::Filled | SplitButtonStyle::Outlined);+ let outline = BoxShadow::new(px(0.), px(0.), cx.theme().colors().border.opacity(0.8))+ .spread_radius(px(1.))+ .inset();+h_flex()- .when(is_filled_or_outlined, |this| {- this.rounded_sm()- .border_1()- .border_color(cx.theme().colors().border.opacity(0.8))- })+ .when(is_filled_or_outlined, |this| this.relative().rounded_sm()).when(self.style == SplitButtonStyle::Transparent, |this| {this.gap_px()})@@ -81,14 +81,19 @@ impl RenderOnce for SplitButton {SplitButtonKind::ButtonLike(button) => button.into_any_element(),SplitButtonKind::IconButton(icon) => icon.into_any_element(),}))- .child(Divider::vertical().map(|s| {- if self.style == SplitButtonStyle::Filled {- s.h_full().color(crate::DividerColor::Border)- } else {- s.h_4()- }+ .child(Divider::vertical().when(is_filled_or_outlined, |s| {+ s.h_full().color(crate::DividerColor::Border)})).child(self.right)+ .when(is_filled_or_outlined, |this| {+ this.child(+ div()+ .absolute()+ .inset_0()+ .rounded_sm()+ .shadow(vec![outline]),+ )+ }).when(self.style == SplitButtonStyle::Filled, |this| {this.bg(ElevationIndex::Surface.on_elevation_bg(cx)).shadow(vec![BoxShadow::new(diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rsindex d1ffb58b792..bfd03a3edf9 100644--- a/crates/zed/src/zed/quick_action_bar.rs+++ b/crates/zed/src/zed/quick_action_bar.rs@@ -327,9 +327,8 @@ impl Render for QuickActionBar {PopoverMenu::new("editor-settings").trigger_with_tooltip(- IconButton::new("toggle_editor_settings_icon", IconName::Sliders)+ IconButton::new("toggle_editor_settings_icon", IconName::Filter).icon_size(IconSize::Small)- .style(ButtonStyle::Subtle).toggle_state(self.toggle_settings_handle.is_deployed()),Tooltip::text("Editor Controls"),)