diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs index 41332911..63125d4b 100644 --- a/crates/ui-egui/src/dock.rs +++ b/crates/ui-egui/src/dock.rs @@ -16,7 +16,7 @@ use crate::i18n::{n_, tr, trf}; use crate::shelf::{Asset, ShelfDrag}; use crate::state::PropsTab; use crate::theme::{Tokens, caption}; -use crate::widgets::{chip, color_swatch, combo, dnd_release, elided, icon_button, section, slider}; +use crate::widgets::{chip, color_swatch, combo, dnd_release, elided, icon_button, section, slider, slider_edit}; const TAG_COLORS: [Color32; 8] = [ Color32::from_rgb(0xc0, 0x40, 0x40), @@ -852,10 +852,10 @@ fn height_mask_section(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer) { } ui.add_enabled_ui(hm.enabled, |ui| { let (mut contrast, mut offset) = (hm.contrast, hm.offset); - if slider(ui, tr("Contrast"), &mut contrast, 0.0..=16.0, 2).drag_stopped() { + if slider_edit(ui, tr("Contrast"), &mut contrast, 0.0..=16.0, 2) { app.run("layer.set", json!({"layer": id, "heightMask": {"contrast": contrast}})); } - if slider(ui, tr("Height offset"), &mut offset, -1.0..=1.0, 2).drag_stopped() { + if slider_edit(ui, tr("Height offset"), &mut offset, -1.0..=1.0, 2) { app.run("layer.set", json!({"layer": id, "heightMask": {"offset": offset}})); } }); @@ -1368,7 +1368,7 @@ fn projection_editor(app: &mut TextureCraftApp, ui: &mut Ui, fill: &Fill, base: Projection::Cylindrical { scale, .. } => (*scale, "cylindrical"), Projection::Decal(_) => return, }; - if slider(ui, tr("Scale / tiling"), &mut scale, 0.01..=20.0, 2).drag_stopped() { + if slider_edit(ui, tr("Scale / tiling"), &mut scale, 0.01..=20.0, 2) { app.run("layer.fill.projection", with(base, json!({"projection": proj_id, "scale": scale}))); } } @@ -1395,7 +1395,7 @@ fn decal_editor(app: &mut TextureCraftApp, ui: &mut Ui, d: &Decal, layer: LayerI ]; let mut done = false; for ((label, range), x) in rows.into_iter().zip(v.iter_mut()) { - done |= slider(ui, label, x, range, 3).drag_stopped(); + done |= slider_edit(ui, label, x, range, 3); } if done { app.run("layer.decal.set", json!({"layer": layer.0, "size": [v[0], v[1]], "rotation": v[2], "offset": [v[3], v[4]], "depth": v[5]})); @@ -1472,11 +1472,11 @@ fn fill_channel(app: &mut TextureCraftApp, ui: &mut Ui, fill: &Fill, base: &Valu ); let mut s = pattern.scale; let mut con = pattern.contrast; - let r1 = slider(ui, tr("Pattern scale"), &mut s, 0.1..=100.0, 1); - let r2 = slider(ui, tr("Contrast"), &mut con, 0.0..=8.0, 2); + let r1 = slider_edit(ui, tr("Pattern scale"), &mut s, 0.1..=100.0, 1); + let r2 = slider_edit(ui, tr("Contrast"), &mut con, 0.0..=8.0, 2); let mut seed = pattern.seed as f32; - let r3 = slider(ui, tr("Seed"), &mut seed, 0.0..=999.0, 0); - if r1.drag_stopped() || r2.drag_stopped() || r3.drag_stopped() { + let r3 = slider_edit(ui, tr("Seed"), &mut seed, 0.0..=999.0, 0); + if r1 || r2 || r3 { app.run( "layer.fill.set", set(json!({"procedural": pattern.kind.label(), "scale": s, "contrast": con, "seed": seed as u64, "low": low, "high": high})), @@ -1525,7 +1525,7 @@ fn effect_properties(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, eid: }); }); let mut op = e.opacity; - if slider(ui, tr("Opacity"), &mut op, 0.0..=1.0, 2).drag_stopped() { + if slider_edit(ui, tr("Opacity"), &mut op, 0.0..=1.0, 2) { app.run("effect.set", json!({"effect": id, "opacity": op})); } ui.separator(); @@ -1542,13 +1542,13 @@ fn effect_properties(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, eid: } }); let (mut level, mut soft, mut noise, mut ns) = (g.level, g.softness, g.noise_amount, g.noise_scale); - let r1 = slider(ui, tr("Level"), &mut level, 0.0..=1.0, 2); - let r2 = slider(ui, tr("Softness"), &mut soft, 0.0..=1.0, 2); - let r3 = slider(ui, tr("Noise amount"), &mut noise, 0.0..=2.0, 2); - let r4 = slider(ui, tr("Noise scale"), &mut ns, 0.1..=64.0, 1); + let r1 = slider_edit(ui, tr("Level"), &mut level, 0.0..=1.0, 2); + let r2 = slider_edit(ui, tr("Softness"), &mut soft, 0.0..=1.0, 2); + let r3 = slider_edit(ui, tr("Noise amount"), &mut noise, 0.0..=2.0, 2); + let r4 = slider_edit(ui, tr("Noise scale"), &mut ns, 0.1..=64.0, 1); let mut inv = g.invert; let r5 = ui.checkbox(&mut inv, tr("Invert")); - if r1.drag_stopped() || r2.drag_stopped() || r3.drag_stopped() || r4.drag_stopped() || r5.changed() { + if r1 || r2 || r3 || r4 || r5.changed() { app.run("effect.set", json!({"effect": id, "level": level, "softness": soft, "noise": noise, "noiseScale": ns, "invert": inv})); } if !app.session.doc.baked.contains_key(&app.session.ts()) { @@ -1564,7 +1564,7 @@ fn effect_properties(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, eid: let mut done = false; for (i, label) in labels.iter().enumerate() { let range = if i == 2 { 0.1..=5.0 } else { 0.0..=1.0 }; - done |= slider(ui, label, &mut v[i], range, 2).drag_stopped(); + done |= slider_edit(ui, label, &mut v[i], range, 2); } if done { app.run("effect.set", json!({"effect": id, "inLow": v[0], "inHigh": v[1], "gamma": v[2], "outLow": v[3], "outHigh": v[4]})); @@ -1592,7 +1592,7 @@ fn effect_properties(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, eid: match source { Source::Uniform(v) => { let mut x = v[0]; - if slider(ui, tr("Value"), &mut x, 0.0..=1.0, 2).drag_stopped() { + if slider_edit(ui, tr("Value"), &mut x, 0.0..=1.0, 2) { app.run("effect.set", json!({"effect": id, "value": x})); } } @@ -1652,7 +1652,7 @@ fn filter_properties(app: &mut TextureCraftApp, ui: &mut Ui, id: u64, f: &Filter ui.label(caption(tr(f.label()))); if let Filter::Hsl { hue, .. } = f { let mut h = hue * 360.0; - if slider(ui, tr("Hue shift (degrees)"), &mut h, -180.0..=180.0, 0).drag_stopped() { + if slider_edit(ui, tr("Hue shift (degrees)"), &mut h, -180.0..=180.0, 0) { set(app, "hue", json!(h / 360.0)); } } @@ -1664,7 +1664,7 @@ fn filter_properties(app: &mut TextureCraftApp, ui: &mut Ui, id: u64, f: &Filter } else { 2 }; - if slider(ui, tr(label), &mut v, lo..=hi, decimals).drag_stopped() { + if slider_edit(ui, tr(label), &mut v, lo..=hi, decimals) { set(app, key, json!(v)); } } @@ -1676,7 +1676,7 @@ fn filter_properties(app: &mut TextureCraftApp, ui: &mut Ui, id: u64, f: &Filter let mut v = *rgb; let mut done = false; for (x, name) in v.iter_mut().zip([tr("Cyan / red"), tr("Magenta / green"), tr("Yellow / blue")]) { - done |= slider(ui, name, x, -1.0..=1.0, 2).drag_stopped(); + done |= slider_edit(ui, name, x, -1.0..=1.0, 2); } if done { set(app, key, json!(v)); diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs index 35598b99..ae9f5981 100644 --- a/crates/ui-egui/src/widgets.rs +++ b/crates/ui-egui/src/widgets.rs @@ -14,11 +14,23 @@ pub fn dnd_release(resp: &Response) -> Option, decimals: usize) -> Response { + slider_inner(ui, label, value, range, decimals).0 +} + +/// [`slider`] for a value re-read from the document every frame: true on the frame an edit is +/// done (a drag released, a click on the track, a typed value), with `value` holding the result. +pub fn slider_edit(ui: &mut Ui, label: &str, value: &mut f32, range: std::ops::RangeInclusive, decimals: usize) -> bool { + slider_inner(ui, label, value, range, decimals).1 +} + +fn slider_inner(ui: &mut Ui, label: &str, value: &mut f32, range: std::ops::RangeInclusive, decimals: usize) -> (Response, bool) { let tk = Tokens::get(ui.ctx()); let (lo, hi) = (*range.start(), *range.end()); let w = ui.available_width(); + let mut done = false; ui.horizontal(|ui| { ui.label(RichText::new(label).color(tk.text)); ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { @@ -29,6 +41,7 @@ pub fn slider(ui: &mut Ui, label: &str, value: &mut f32, range: std::ops::RangeI && v.is_finite() { *value = v.clamp(lo, hi); + done = true; } }); }); @@ -38,14 +51,22 @@ pub fn slider(ui: &mut Ui, label: &str, value: &mut f32, range: std::ops::RangeI { let t = ((p.x - rect.left() - 5.0) / (rect.width() - 10.0).max(1.0)).clamp(0.0, 1.0); let v = lo + (hi - lo) * t; + // Remembered for the release frame, where the pointer no longer drags. + ui.data_mut(|d| d.insert_temp(resp.id, v)); if (v - *value).abs() > f32::EPSILON { *value = v; resp.mark_changed(); } } + if resp.drag_stopped() || resp.clicked() { + if let Some(v) = ui.data_mut(|d| d.remove_temp::(resp.id)) { + *value = v; + } + done = true; + } let t = if hi > lo { ((*value - lo) / (hi - lo)).clamp(0.0, 1.0) } else { 0.0 }; track(ui, &resp, rect.left() + 5.0..=rect.right() - 5.0, rect.center().y, t, 2.0, 4.5); - resp + (resp, done) } /// A small inline slider for the top tool bar: "Label value" above a short track. diff --git a/crates/ui-egui/src/windows.rs b/crates/ui-egui/src/windows.rs index eab0046e..417c8057 100644 --- a/crates/ui-egui/src/windows.rs +++ b/crates/ui-egui/src/windows.rs @@ -15,7 +15,7 @@ use crate::i18n::LANGUAGES; use crate::i18n::{tr, trf}; use crate::state::Mode; use crate::theme::{Accent, Brightness, Tokens, caption}; -use crate::widgets::{color_swatch, combo, icon_button, primary_button, slider}; +use crate::widgets::{color_swatch, combo, icon_button, primary_button, slider, slider_edit}; pub fn show(app: &mut TextureCraftApp, ctx: &egui::Context) { start(app, ctx); @@ -204,7 +204,7 @@ pub(crate) fn shader(app: &mut TextureCraftApp, ui: &mut Ui) { let ts = app.session.ts(); if let Some(set) = app.session.doc.project.texture_sets.get(ts) { let mut hs = set.height_strength; - if slider(ui, tr("Height to normal strength"), &mut hs, 0.0..=10.0, 2).drag_stopped() { + if slider_edit(ui, tr("Height to normal strength"), &mut hs, 0.0..=10.0, 2) { app.run("textureSet.settings", json!({"ts": ts, "heightStrength": hs})); } } diff --git a/crates/ui-egui/tests/effect_sliders.rs b/crates/ui-egui/tests/effect_sliders.rs new file mode 100644 index 00000000..a4bb3915 --- /dev/null +++ b/crates/ui-egui/tests/effect_sliders.rs @@ -0,0 +1,62 @@ +//! The sliders of a selected effect (opacity, generator, levels…) apply what they were dragged +//! or clicked to. + +use egui_kittest::Harness; +use egui_kittest::kittest::Queryable; +use serde_json::json; +use texturecraft_engine::core::{EffectKind, LayerId}; +use texturecraft_ui_egui::TextureCraftApp; + +/// The sample session with its first generator effect selected, and that effect's id. +fn harness() -> (Harness<'static, TextureCraftApp>, LayerId) { + let mut session = texturecraft_engine::sample_session(256, 64).unwrap(); + let (layer, effect) = session + .doc + .project + .layers + .values() + .find_map(|l| { + let mask = l.mask.iter().flat_map(|m| m.effects.iter()); + l.content_effects.iter().chain(mask).find(|e| matches!(e.kind, EffectKind::Generator(_))).map(|e| (l.id, e.id)) + }) + .unwrap(); + texturecraft_engine::execute(&mut session, "layer.select", &json!({"layer": layer.0, "target": effect.0})).unwrap(); + let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1400.0)).build_eframe(|cc| TextureCraftApp::new(cc, session)); + h.run_steps(4); + (h, effect) +} + +fn opacity(h: &Harness<'_, TextureCraftApp>, effect: LayerId) -> f32 { + h.state().session.doc.project.effect(effect).unwrap().1.opacity +} + +/// The track under the slider labelled `label` (the row below the label). +fn track(h: &Harness<'_, TextureCraftApp>, label: &str) -> egui::Rect { + let l = h.get_by_label(label).rect(); + egui::Rect::from_min_max(egui::pos2(l.left() + 6.0, l.bottom() + 6.0), egui::pos2(l.left() + 200.0, l.bottom() + 14.0)) +} + +#[test] +fn dragging_the_effect_opacity_applies_it() { + let (mut h, effect) = harness(); + assert_eq!(opacity(&h, effect), 1.0); + let t = track(&h, "Opacity"); + h.drag_at(egui::pos2(t.right(), t.center().y)); + h.run_steps(2); + h.hover_at(egui::pos2(t.left() + 20.0, t.center().y)); + h.run_steps(2); + h.drop_at(egui::pos2(t.left() + 20.0, t.center().y)); + h.run_steps(3); + assert!(opacity(&h, effect) < 0.5, "the dragged opacity applies: {}", opacity(&h, effect)); +} + +#[test] +fn clicking_the_effect_opacity_applies_it() { + let (mut h, effect) = harness(); + let t = track(&h, "Opacity"); + let at = egui::pos2(t.left() + 20.0, t.center().y); + h.drag_at(at); + h.drop_at(at); + h.run_steps(3); + assert!(opacity(&h, effect) < 0.5, "a click on the track applies: {}", opacity(&h, effect)); +}