zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

ui: Give NumericSteppers an ID (#15344)

Browse Source 
This PR gives the `NumericStepper` component an ID.

This prevents the UI and buffer font size settings controls from having
their increment/decrement buttons visually change when the other one is
pressed.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-07-27 13:02:27 -04:00 committed by GitHub
parent c7a78fafac
commit f1d777434b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/editor/src/editor_settings_controls.rs
View File

@ -140,6 +140,7 @@ impl RenderOnce for BufferFontSizeControl {
.gap_2()
.child(Icon::new(IconName::FontSize))
.child(NumericStepper::new(
"buffer-font-size",
value.to_string(),
move |_, cx| {
Self::write(value - px(1.), cx);

1
crates/settings_ui/src/appearance_settings_controls.rs
View File

@ -260,6 +260,7 @@ impl RenderOnce for UiFontSizeControl {
.gap_2()
.child(Icon::new(IconName::FontSize))
.child(NumericStepper::new(
"ui-font-size",
value.to_string(),
move |_, cx| {
Self::write(value - px(1.), cx);

2
crates/title_bar/src/application_menu.rs
View File

@ -26,6 +26,7 @@ impl RenderOnce for ApplicationMenu {
.child(Label::new("Buffer Font Size"))
.child(
NumericStepper::new(
"buffer-font-size",
theme::get_buffer_font_size(cx).to_string(),
|_, cx| {
cx.dispatch_action(Box::new(
@ -61,6 +62,7 @@ impl RenderOnce for ApplicationMenu {
.child(Label::new("UI Font Size"))
.child(
NumericStepper::new(
"ui-font-size",
theme::get_ui_font_size(cx).to_string(),
|_, cx| {
cx.dispatch_action(Box::new(

4
crates/ui/src/components/numeric_stepper.rs
View File

@ -4,6 +4,7 @@ use crate::{prelude::*, IconButtonShape};
#[derive(IntoElement)]
pub struct NumericStepper {
id: ElementId,
value: SharedString,
on_decrement: Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>,
on_increment: Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>,
@ -14,11 +15,13 @@ pub struct NumericStepper {
impl NumericStepper {
pub fn new(
id: impl Into<ElementId>,
value: impl Into<SharedString>,
on_decrement: impl Fn(&ClickEvent, &mut WindowContext) + 'static,
on_increment: impl Fn(&ClickEvent, &mut WindowContext) + 'static,
) -> Self {
Self {
id: id.into(),
value: value.into(),
on_decrement: Box::new(on_decrement),
on_increment: Box::new(on_increment),
@ -47,6 +50,7 @@ impl RenderOnce for NumericStepper {
let icon_size = IconSize::Small;
h_flex()
.id(self.id)
.gap_1()
.map(|element| {
if let Some(on_reset) = self.on_reset {