Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Align agent sidebar headers with title bar (#62079)

feeiyub036368ce9b6
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index a9c232c7faf..fe97859f0a0 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -18,9 +18,9 @@ use editor::Editor;
use fs::Fs;
use fuzzy::{StringMatch, StringMatchCandidate};
use gpui::{
- AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
- ListState, Render, SharedString, Subscription, Task, TaskExt, WeakEntity, Window, list,
- prelude::*, px,
+ AnyElement, App, Context, Decorations, DismissEvent, Entity, EventEmitter, FocusHandle,
+ Focusable, ListState, Render, SharedString, Subscription, Task, TaskExt, WeakEntity, Window,
+ list, prelude::*, px,
};
use itertools::Itertools as _;
use menu::{Confirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
@@ -868,8 +868,10 @@ impl ThreadsArchiveView {
h_flex()
.h(header_height)
- .mt_px()
- .pb_px()
+ .map(|header| match window.window_decorations() {
+ Decorations::Client { .. } => header.mt(px(-1.)),
+ Decorations::Server => header.mt_px().pb_px(),
+ })
.when(left_window_controls, |this| {
this.children(Self::render_left_window_controls(window, cx))
})
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index 70baec374f8..d82584c7cbb 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -7502,8 +7502,10 @@ impl Sidebar {
h_flex()
.h(header_height)
- .mt_px()
- .pb_px()
+ .map(|header| match window.window_decorations() {
+ Decorations::Client { .. } => header.mt(px(-1.)),
+ Decorations::Server => header.mt_px().pb_px(),
+ })
.when(left_window_controls, |this| {
this.children(Self::render_left_window_controls(window, cx))
})