Skip to content

fix(settings): stabilize navigation hover state #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tryanks merged 1 commit into from
Aug 27, 2026
Merged

fix(settings): stabilize navigation hover state #307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions crates/ui/src/settings_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,40 +431,45 @@ impl SettingsPage {
} else {
cx.theme().muted_foreground
};
crate::material::accessible_clickable(div(), id, Role::Tab, label.clone(), cx)
.aria_selected(active)
.child(
gpui_base::h_flex()
// Match the main sidebar thread rows: 30px tall, 13px
// label, a tight 6px rounded rect tinted when active and
// a neutral hover only when not.
.h(px(30.))
.items_center()
.gap_2()
.px_2()
.rounded(px(6.))
.cursor_pointer()
.when(active, |s| s.bg(cx.theme().list_active))
.when(!active, |s| s.hover(|s| s.bg(cx.theme().sidebar_accent)))
.child(Icon::new(icon).size_4().text_color(fg))
.child(
div()
.text_size(px(13.))
.when(active, |d| d.font_medium())
.text_color(fg)
.child(label.clone()),
),
)
.on_click(cx.listener(move |this, _, _, cx| {
this.section = section;
// Refresh the TCC snapshot each time Computer Use becomes
// visible (cheap native calls, event-driven).
if section == Section::ComputerUse {
this.perm_status = permissions::check();
}
cx.notify();
}))
.into_any_element()
crate::material::accessible_clickable(
gpui_base::h_flex(),
id,
Role::Tab,
label.clone(),
cx,
)
.aria_selected(active)
// Keep the hitbox, stable element id, and hover style on the
// same element. Splitting them across an outer clickable and
// an anonymous inner row leaves GPUI tracking two overlapping
// interaction regions, which makes hover paint stale or skip
// as the pointer crosses adjacent tabs.
.h(px(30.))
.items_center()
.gap_2()
.px_2()
.rounded(px(6.))
.cursor_pointer()
.when(active, |s| s.bg(cx.theme().list_active))
.when(!active, |s| s.hover(|s| s.bg(cx.theme().sidebar_accent)))
.child(Icon::new(icon).size_4().text_color(fg))
.child(
div()
.text_size(px(13.))
.when(active, |d| d.font_medium())
.text_color(fg)
.child(label.clone()),
)
.on_click(cx.listener(move |this, _, _, cx| {
this.section = section;
// Refresh the TCC snapshot each time Computer Use becomes
// visible (cheap native calls, event-driven).
if section == Section::ComputerUse {
this.perm_status = permissions::check();
}
cx.notify();
}))
.into_any_element()
};

v_flex()
Expand Down