From 265e4e33e58d7b3917ce071d5598d751621dd336 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 16 Nov 2026 16:37:58 +0000 Subject: [PATCH] Layer Style sliders sit on one line beside their label --- crates/imaging/src/ui/layer_style/blending.rs | 9 +++++++-- crates/imaging/src/ui/layer_style/page.rs | 14 +++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/crates/imaging/src/ui/layer_style/blending.rs b/crates/imaging/src/ui/layer_style/blending.rs index 7db5e6681..5d9c7e091 100644 --- a/crates/imaging/src/ui/layer_style/blending.rs +++ b/crates/imaging/src/ui/layer_style/blending.rs @@ -5,7 +5,7 @@ use std::cell::RefCell; use craft_behavior::EditEvents; use craft_ui::choice::Checkbox; use craft_ui::contract::{Bind, Entry, Props as _, Show as _, ShowContainer as _}; -use craft_ui::form::{Field, FieldGroup, SliderField}; +use craft_ui::form::{Field, FieldGroup, SliderField, SliderFieldLayout}; use craft_ui::layout_components::Stack; use craft_ui::pickers::Select; use craft_ui::runtime::env::UnitKind; @@ -200,7 +200,12 @@ fn with_current(modes: &[Entry], current: &str) -> Vec> { /// A 0..=100 % slider and field, whole percent. fn percent(ui: &mut Ui, label: &Label, value: f32) -> craft_ui::contract::EditResponse { - SliderField::new(label.clone(), Bind::given(f64::from(value)), 0.0..=100.0).step(1.0).unit_kind(UnitKind::Percent).show(ui).edit + SliderField::new(label.clone(), Bind::given(f64::from(value)), 0.0..=100.0) + .step(1.0) + .unit_kind(UnitKind::Percent) + .layout(SliderFieldLayout::Inline) + .show(ui) + .edit } /// The Advanced Blending checks' values, in Photoshop's order. diff --git a/crates/imaging/src/ui/layer_style/page.rs b/crates/imaging/src/ui/layer_style/page.rs index 8536269a4..03d87ee43 100644 --- a/crates/imaging/src/ui/layer_style/page.rs +++ b/crates/imaging/src/ui/layer_style/page.rs @@ -9,7 +9,7 @@ use craft_ui::buttons::Button; use craft_ui::choice::{Checkbox, Swatch}; use craft_ui::contract::{Bind, EditResponse, Entry, Props as _, Show as _, ShowContainer as _, clicked}; use craft_ui::display::Text; -use craft_ui::form::{Field, FieldGroup, SliderField}; +use craft_ui::form::{Field, FieldGroup, SliderField, SliderFieldLayout}; use craft_ui::layout::RowAlign; use craft_ui::layout_components::{Row, Stack}; use craft_ui::patterns::presets::{PresetPicker, PresetRow, PresetState}; @@ -201,8 +201,16 @@ fn field_row(ui: &mut Ui, input: &PageInput<'_>, field: &EffectField, shown: &St if let Some(default) = input.spec.defaults.number(key) { bind = bind.reset(default); } - let slider = SliderField::new(label.clone(), bind.reborrowed(), *min..=*max).unit_kind(unit_kind(*unit)).step(1.0).id_salt(key).show(ui); - push_edit(&mut out.edit, style_edit(&slider, input.style, |v| param(StyleValue::Number(v.round())))); + let slider = Field::new(label.clone()).id_salt(key).show(ui, |ui, _| { + SliderField::new(label.clone(), bind.reborrowed(), *min..=*max) + .unit_kind(unit_kind(*unit)) + .step(1.0) + .layout(SliderFieldLayout::Inline) + .show(ui) + }); + if let Some(slider) = slider.inner { + push_edit(&mut out.edit, style_edit(&slider, input.style, |v| param(StyleValue::Number(v.round())))); + } } FieldKind::Angle => { let value = shown.number(key).unwrap_or(0.0);