mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-19 06:59:22 +01:00
onboarding: Keep header pinned while scrolling (#67079)
## Summary Closes #66920 Make the header section sticky so that finish button is always in viewport. Before, the tree was: ``` div (root, scrollbar here) └─ div#page-content (scrolls) └─ v_flex (780px, p_12, gap_6) ├─ header row ├─ divider └─ page body ``` After, it is: ``` v_flex (root) ├─ v_flex ← header block, flex_none (never scrolls) │ ├─ header row │ └─ divider └─ div (relative, flex_1, min_h_0, scrollbar here) └─ div#page-content (scrolls, track_scroll) └─ v_flex (780px, px_12, pb_12) └─ page body ``` ## Testing I have tested the page in various themes, the header cleanly merges with the rest of page body without the overhanging padding in sticky section. Before: Header (and finish onboarding button) would scroll out of view. <img width="1496" height="388" alt="Screenshot 2026-11-13 at 12 06 35 PM" src="https://github.com/user-attachments/assets/2399c54f-58d5-4c87-8517-7deaf7409cbf" /> After: Header sticks to top while the rest of page content scrolls. <img width="1257" height="783" alt="Screenshot 2026-11-17 at 11 39 15 AM" src="https://github.com/user-attachments/assets/2569d16a-dd72-48d9-b46a-b900f1885bb1" /> https://github.com/user-attachments/assets/07ab374c-cede-4458-95a2-48012bbe738d ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Improved the onboarding page to keep the "Finish Setup" button visible while scrolling. --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
This commit is contained in:
@@ -301,9 +301,19 @@ impl Onboarding {
|
||||
}
|
||||
}
|
||||
|
||||
/// The pinned header and the scrolling body share this so they stay aligned.
|
||||
fn content_column() -> Div {
|
||||
v_flex()
|
||||
.min_w_0()
|
||||
.max_w(rems_from_px(780_f32))
|
||||
.w_full()
|
||||
.mx_auto()
|
||||
.px_12()
|
||||
}
|
||||
|
||||
impl Render for Onboarding {
|
||||
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||||
div()
|
||||
v_flex()
|
||||
.image_cache(gpui::retain_all("onboarding-page"))
|
||||
.key_context({
|
||||
let mut ctx = KeyContext::new_with_defaults(cx.platform_info().os);
|
||||
@@ -325,62 +335,66 @@ impl Render for Onboarding {
|
||||
window.focus_prev(cx);
|
||||
cx.notify();
|
||||
}))
|
||||
.vertical_scrollbar_for(&self.scroll_handle, window, cx)
|
||||
.child(
|
||||
div()
|
||||
.id("page-content")
|
||||
.size_full()
|
||||
.overflow_y_scroll()
|
||||
content_column()
|
||||
.flex_none()
|
||||
.pt_12()
|
||||
.gap_6()
|
||||
.child(
|
||||
v_flex()
|
||||
.min_w_0()
|
||||
.max_w(rems_from_px(780_f32))
|
||||
h_flex()
|
||||
.w_full()
|
||||
.mx_auto()
|
||||
.p_12()
|
||||
.gap_6()
|
||||
.gap_4()
|
||||
.justify_between()
|
||||
.child(
|
||||
h_flex()
|
||||
.w_full()
|
||||
.gap_4()
|
||||
.justify_between()
|
||||
.child(Vector::square(VectorName::ZedLogo, rems(2.5)))
|
||||
.child(
|
||||
h_flex()
|
||||
.gap_4()
|
||||
.child(Vector::square(VectorName::ZedLogo, rems(2.5)))
|
||||
v_flex()
|
||||
.child(
|
||||
v_flex()
|
||||
.child(
|
||||
Headline::new("Welcome to Zed")
|
||||
.size(HeadlineSize::Small),
|
||||
)
|
||||
.child(
|
||||
Label::new("The editor for what's next")
|
||||
.color(Color::Muted)
|
||||
.size(LabelSize::Small)
|
||||
.italic(),
|
||||
),
|
||||
Headline::new("Welcome to Zed")
|
||||
.size(HeadlineSize::Small),
|
||||
)
|
||||
.child(
|
||||
Label::new("The editor for what's next")
|
||||
.color(Color::Muted)
|
||||
.size(LabelSize::Small)
|
||||
.italic(),
|
||||
),
|
||||
)
|
||||
.child({
|
||||
Button::new("finish_setup", "Finish Setup")
|
||||
.style(ButtonStyle::Filled)
|
||||
.size(ButtonSize::Medium)
|
||||
.width(rems_from_px(200_f32))
|
||||
.key_binding(KeyBinding::for_action_in(
|
||||
&Finish,
|
||||
&self.focus_handle,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_, window, cx| {
|
||||
window.dispatch_action(Finish.boxed_clone(), cx);
|
||||
})
|
||||
}),
|
||||
),
|
||||
)
|
||||
.child(Divider::horizontal().color(ui::DividerColor::BorderVariant))
|
||||
.child(self.render_page(cx)),
|
||||
.child({
|
||||
Button::new("finish_setup", "Finish Setup")
|
||||
.style(ButtonStyle::Filled)
|
||||
.size(ButtonSize::Medium)
|
||||
.width(rems_from_px(200_f32))
|
||||
.key_binding(KeyBinding::for_action_in(
|
||||
&Finish,
|
||||
&self.focus_handle,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_, window, cx| {
|
||||
window.dispatch_action(Finish.boxed_clone(), cx);
|
||||
})
|
||||
}),
|
||||
)
|
||||
.track_scroll(&self.scroll_handle),
|
||||
.child(Divider::horizontal().color(ui::DividerColor::BorderVariant)),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.relative()
|
||||
.flex_1()
|
||||
.min_h_0()
|
||||
.w_full()
|
||||
.vertical_scrollbar_for(&self.scroll_handle, window, cx)
|
||||
.child(
|
||||
div()
|
||||
.id("page-content")
|
||||
.size_full()
|
||||
.overflow_y_scroll()
|
||||
.track_scroll(&self.scroll_handle)
|
||||
.child(content_column().pt_6().pb_12().child(self.render_page(cx))),
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user