mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-17 02:54:25 +00:00
Layer Style sliders sit on one line beside their label
This commit is contained in:
@@ -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<String>], current: &str) -> Vec<Entry<String>> {
|
||||
|
||||
/// A 0..=100 % slider and field, whole percent.
|
||||
fn percent(ui: &mut Ui, label: &Label, value: f32) -> craft_ui::contract::EditResponse<f64> {
|
||||
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.
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user