Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oh no, focus is hard

Browse source
This commit is contained in:
Mikayla Maki 2025-08-19 21:21:01 -07:00
parent e47b9d3b38
commit 2eeede1efb
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/gpui/src/interactive.rs
View file

@ -259,6 +259,14 @@ impl ClickEvent {
ClickEvent::Mouse(event) => event.up.click_count, ClickEvent::Mouse(event) => event.up.click_count,
} }
} }
/// Returns whether the click event is generated by a keyboard event
pub fn is_keyboard(&self) -> bool {
match self {
ClickEvent::Mouse(_) => false,
ClickEvent::Keyboard(_) => true,
}
}
} }
/// An enum representing the keyboard button that was pressed for a click event. /// An enum representing the keyboard button that was pressed for a click event.

1
crates/onboarding/src/editing_page.rs
View file

@ -445,6 +445,7 @@ fn font_picker_stepper(
optimistic_font_size.write(cx, Some(*new_value)); optimistic_font_size.write(cx, Some(*new_value));
write_font_size(Pixels::from(*new_value), cx); write_font_size(Pixels::from(*new_value), cx);
}) })
.format(|value| format!("{value}px"))
.style(ui_input::NumericStepperStyle::Outlined) .style(ui_input::NumericStepperStyle::Outlined)
.tab_index({ .tab_index({
*tab_index += 2; *tab_index += 2;

24
crates/ui_input/src/numeric_stepper.rs
View file

@ -278,14 +278,13 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
let decrement_handler = { let decrement_handler = {
let value = self.value.clone(); let value = self.value.clone();
let on_change = self.on_change.clone(); let on_change = self.on_change.clone();
let focus = self.focus_handle.clone();
let min = self.min_value; let min = self.min_value;
move |click: &ClickEvent, window: &mut Window, cx: &mut App| { move |click: &ClickEvent, window: &mut Window, cx: &mut App| {
let step = get_step(click.modifiers()); let step = get_step(click.modifiers());
let new_value = value - step; let new_value = value - step;
let new_value = if new_value < min { min } else { new_value }; let new_value = if new_value < min { min } else { new_value };
on_change(&new_value, window, cx); on_change(&new_value, window, cx);
window.focus(&focus); window.focus_prev();
} }
}; };
@ -332,11 +331,16 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
NumericStepperMode::Read => div() NumericStepperMode::Read => div()
.id("numeric_stepper_label") .id("numeric_stepper_label")
.child(Label::new((self.format)(&self.value)).mx_3()) .child(Label::new((self.format)(&self.value)).mx_3())
.when_some(tab_index.as_mut(), |this, tab_index| {
*tab_index += 1;
this.tab_index(*tab_index - 1).focus(|style| {
style.bg(cx.theme().colors().element_hover)
})
})
.on_click({ .on_click({
let mode = self.mode.clone(); let mode = self.mode.clone();
move |click, _, cx| { move |click, _, cx| {
if click.click_count() == 2 { if click.click_count() == 2 || click.is_keyboard() {
mode.write(cx, NumericStepperMode::Edit); mode.write(cx, NumericStepperMode::Edit);
} }
} }
@ -348,6 +352,7 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
NumericStepperMode::Edit => div() NumericStepperMode::Edit => div()
.child(window.use_state(cx, { .child(window.use_state(cx, {
|window, cx| { |window, cx| {
let previous_focus_handle = window.focused(cx);
let mut editor = Editor::single_line(window, cx); let mut editor = Editor::single_line(window, cx);
editor.set_text(format!("{}", self.value), window, cx); editor.set_text(format!("{}", self.value), window, cx);
@ -368,6 +373,11 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
new_value new_value
}; };
if let Some(previous) =
previous_focus_handle.as_ref()
{
window.focus(previous);
}
on_change(&new_value, window, cx); on_change(&new_value, window, cx);
}; };
mode.write(cx, NumericStepperMode::Read); mode.write(cx, NumericStepperMode::Read);
@ -381,9 +391,8 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
} }
})) }))
.on_action::<menu::Confirm>({ .on_action::<menu::Confirm>({
let focus = self.focus_handle.clone();
move |_, window, _| { move |_, window, _| {
window.focus(&focus); window.blur();
} }
}) })
.size_full() .size_full()
@ -396,7 +405,6 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
.map(|increment| { .map(|increment| {
let increment_handler = { let increment_handler = {
let value = self.value.clone(); let value = self.value.clone();
let focus = self.focus_handle.clone();
let on_change = self.on_change.clone(); let on_change = self.on_change.clone();
let max = self.max_value; let max = self.max_value;
move |click: &ClickEvent, window: &mut Window, cx: &mut App| { move |click: &ClickEvent, window: &mut Window, cx: &mut App| {
@ -404,7 +412,7 @@ impl<T: NumericStepperType> RenderOnce for NumericStepper<T> {
let new_value = value + step; let new_value = value + step;
let new_value = if new_value > max { max } else { new_value }; let new_value = if new_value > max { max } else { new_value };
on_change(&new_value, window, cx); on_change(&new_value, window, cx);
window.focus(&focus); // window.focus(&focus);
} }
}; };