Project · focus that follows: segments, the tracker's action, tests

A segmented control too narrow for its segments now scrolls sideways
in a strip of its own, and a segment that takes focus comes into view:
its focus is a tab_stop handle, and layout::reveal_when_focused, now
shared with the board's cards, measures it from a box that holds its
ring. The DatabaseView's own strip goes.

The time tracker's Start and Stop are one Button that keeps one handle
through the new Button::focus_handle. A start moves focus to it, a stop
hands focus back to the field, and the field starts on Enter's release,
so the release no longer clicks the Stop that took focus.

ProgressRing's percent refuses content inside, as content refuses a
percent. Tests: Enter starts, Enter stops after 90 seconds, and the
field takes the keys again; Skip moves on at once; a focused Timeline
segment at 280px comes into view; the ring's refusal.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ZacharyZhang-NYandClaude Opus 5.5 committed 2026-09-27 06:32:50 -04:00
1 parent 6377f926c8
commit 86336ee828
13 files changed
+294 -132

No files matched your search

+14 -4
View File
@@ -1,6 +1,6 @@
use gpui::{
App, ClickEvent, ElementId, FontWeight, Hsla, IntoElement, Keystroke, MouseButton, RenderOnce,
SharedString, Window, div, prelude::*, transparent_black,
App, ClickEvent, ElementId, FocusHandle, FontWeight, Hsla, IntoElement, Keystroke, MouseButton,
RenderOnce, SharedString, Window, div, prelude::*, transparent_black,
};
use crate::{
@@ -131,6 +131,7 @@ pub struct Button {
disabled: bool,
loading: bool,
full_width: bool,
focus: Option<FocusHandle>,
pub(crate) slot: Option<Slot>,
on_click: Option<ClickHandler>,
}
@@ -148,6 +149,7 @@ impl Button {
disabled: false,
loading: false,
full_width: false,
focus: None,
slot: None,
on_click: None,
}
@@ -185,6 +187,12 @@ impl Button {
self
}
/// Takes focus through the owner's handle, one that outlives a mode where the button changes; a Tab stop when built with `tab_stop`.
pub fn focus_handle(mut self, handle: &FocusHandle) -> Self {
self.focus = Some(handle.clone());
self
}
pub fn disabled(mut self, disabled: bool) -> Self {
self.disabled = disabled;
self
@@ -277,14 +285,16 @@ impl RenderOnce for Button {
if self.disabled {
return el.opacity(0.45).cursor_not_allowed();
}
let el = match &self.focus {
Some(handle) => el.track_focus(handle),
None => el.tab_index(0),
};
if self.loading {
return el
.tab_index(0)
.focus_ring(cx)
.on_mouse_down(MouseButton::Left, |_, window, _| window.prevent_default());
}
el.cursor_pointer()
.tab_index(0)
.hover(|style| {
let style = style.bg(tone.hover);
if link { style.underline() } else { style }