From d710edf399c356ee137c4a59a1e635ba3e784dbc Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 16:39:14 +0000 Subject: [PATCH] panels-w3: rustfmt --- crates/draw/src/ui/mod.rs | 4 ++-- crates/draw/src/ui/paint_bar.rs | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/crates/draw/src/ui/mod.rs b/crates/draw/src/ui/mod.rs index b5ffece5b..09a07746d 100644 --- a/crates/draw/src/ui/mod.rs +++ b/crates/draw/src/ui/mod.rs @@ -79,8 +79,8 @@ pub use crop::{ pub use crop::{PerspectiveCropQuad, PerspectiveQuad}; pub use gradient::{GradientFill, GradientFillEditor, GradientFillEditorOutput, GradientFillWords, GradientStyle}; pub use gradient::{ - GradientGroup, GradientItem, GradientLine, GradientMap, GradientMapEditor, GradientMapOutput, GradientOverlay, GradientPalette, - GradientRef, GradientSwatch, LineGradient, LinePart, + GradientGroup, GradientItem, GradientLine, GradientMap, GradientMapEditor, GradientMapOutput, GradientOverlay, GradientPalette, GradientRef, + GradientSwatch, LineGradient, LinePart, }; pub use measure::{MIN_LINE, RulerBar, RulerBarOutput, RulerLine, RulerOverlay, RulerPass, RulerTool, RulerWords, box_distances, ruler_line_form}; pub use paint_bar::{ diff --git a/crates/draw/src/ui/paint_bar.rs b/crates/draw/src/ui/paint_bar.rs index c424bc57d..fcfac4dbc 100644 --- a/crates/draw/src/ui/paint_bar.rs +++ b/crates/draw/src/ui/paint_bar.rs @@ -6,7 +6,9 @@ use craft_behavior::{EditEvent, EditEvents, IconId, Mixed, Value}; use craft_theme::Srgba; use craft_ui::buttons::IconButton; use craft_ui::choice::{Checkbox, Swatch}; -use craft_ui::contract::{Bind, BodyCx, Entry, Gap, LabelKind, PopupKind, Props as _, Remember as _, Show as _, ShowContainer as _, SideLabel, Sizing, Trigger, clicked}; +use craft_ui::contract::{ + Bind, BodyCx, Entry, Gap, LabelKind, PopupKind, Props as _, Remember as _, Show as _, ShowContainer as _, SideLabel, Sizing, Trigger, clicked, +}; use craft_ui::display::Divider; use craft_ui::form::Field; use craft_ui::layout_components::Row; @@ -350,9 +352,12 @@ impl Pass<'_, M> { let current = self.values.size; let mut events = EditEvents::new(); // The size field draws its own caption, so the wrapper only carries the enabled state. - Field::new(caption.clone()).side(SideLabel::new().kind(LabelKind::Hidden)).id_salt("size").sizing(Sizing::Content).enabled(enabled).show(ui, |ui, _| { - events = BrushSizeField::new(caption.clone(), Bind::given(current), max).show(ui).edit.events.clone(); - }); + Field::new(caption.clone()).side(SideLabel::new().kind(LabelKind::Hidden)).id_salt("size").sizing(Sizing::Content).enabled(enabled).show( + ui, + |ui, _| { + events = BrushSizeField::new(caption.clone(), Bind::given(current), max).show(ui).edit.events.clone(); + }, + ); self.emit(events, |v, size| v.size = size); } @@ -425,12 +430,8 @@ impl Pass<'_, M> { /// The gear and its popover of the four smoothing options, enabled while the amount shows above 0 %. fn smoothing_options(&mut self, ui: &mut Ui, cx: &mut BodyCx<'_>, words: &PaintBarWords) { let mut open = cx.memory::().0; - let gear = IconButton::new(IconId::new("settings")) - .label(words.smoothing_options.clone()) - .popup(PopupKind::Dialog) - .expanded(open) - .show(ui) - .response; + let gear = + IconButton::new(IconId::new("settings")).label(words.smoothing_options.clone()).popup(PopupKind::Dialog).expanded(open).show(ui).response; if clicked(&gear) { open = !open; }