From 20e74727bb756d9cf757ccfb397a45e4d968d825 Mon Sep 17 00:00:00 2001 From: Per Lindgren <per.lindgren@ltu.se> Date: Sun, 26 Jan 2020 23:37:18 +0100 Subject: [PATCH] ADSR with a viev (padding experiment), fixed redundant value in src/dial --- examples/dial.rs | 12 ++++++------ examples/draw.rs | 12 ++++++------ src/dial.rs | 5 ++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/examples/dial.rs b/examples/dial.rs index a336e5d..97fc7d4 100644 --- a/examples/dial.rs +++ b/examples/dial.rs @@ -25,14 +25,14 @@ struct DialLabel { } impl DialLabel { - fn new(text: &str, value: f64) -> impl Widget<DialLabel> { + fn new(text: &str) -> impl Widget<DialLabel> { let text = text.to_string(); let label = Label::new(move |data: &DialLabel, _env: &_| format!("{} {:.3}", text, data.value)); let solid = Color::rgb8(0x3a, 0x3a, 0x3a); let mut col = Flex::column(); col.add_child( - Dial::new(value, Size::new(100.0, 100.0)) + Dial::new(Size::new(100.0, 100.0)) .lens(DialLabel::value) .background(solid.clone()) .padding(5.0), @@ -55,28 +55,28 @@ impl Envelope { let solid = Color::rgb8(0x3a, 0x3a, 0x3a); Flex::row() .with_child( - DialLabel::new("Attack", 0.0) + DialLabel::new("Attack") .lens(Envelope::attack) .background(solid.clone()) .padding(5.0), 0.0, ) .with_child( - DialLabel::new("Decay", 0.0) + DialLabel::new("Decay") .lens(Envelope::decay) .background(solid.clone()) .padding(5.0), 0.0, ) .with_child( - DialLabel::new("Sustain", 0.0) + DialLabel::new("Sustain") .lens(Envelope::sustain) .background(solid.clone()) .padding(5.0), 0.0, ) .with_child( - DialLabel::new("Release", 0.0) + DialLabel::new("Release") .lens(Envelope::release) .background(solid.clone()) .padding(5.0), diff --git a/examples/draw.rs b/examples/draw.rs index 93f6888..23ededb 100644 --- a/examples/draw.rs +++ b/examples/draw.rs @@ -30,14 +30,14 @@ struct DialLabel { } impl DialLabel { - fn new(text: &str, value: f64) -> impl Widget<DialLabel> { + fn new(text: &str) -> impl Widget<DialLabel> { let text = text.to_string(); let label = Label::new(move |data: &DialLabel, _env: &_| format!("{} {:.3}", text, data.value)); let solid = Color::rgb8(0x3a, 0x3a, 0x3a); let mut col = Flex::column(); col.add_child( - Dial::new(value, Size::new(100.0, 100.0)) + Dial::new(Size::new(100.0, 100.0)) .lens(DialLabel::value) .background(solid.clone()) .padding(5.0), @@ -61,28 +61,28 @@ impl Envelope { let solid = Color::rgb8(0x3a, 0x3a, 0x3a); Flex::row() .with_child( - DialLabel::new("Attack", 0.0) + DialLabel::new("Attack") .lens(Envelope::attack) .background(solid.clone()) .padding(5.0), 0.0, ) .with_child( - DialLabel::new("Decay", 0.0) + DialLabel::new("Decay") .lens(Envelope::decay) .background(solid.clone()) .padding(5.0), 0.0, ) .with_child( - DialLabel::new("Sustain", 0.0) + DialLabel::new("Sustain") .lens(Envelope::sustain) .background(solid.clone()) .padding(5.0), 0.0, ) .with_child( - DialLabel::new("Release", 0.0) + DialLabel::new("Release") .lens(Envelope::release) .background(solid.clone()) .padding(5.0), diff --git a/src/dial.rs b/src/dial.rs index 392a784..6ed1e17 100644 --- a/src/dial.rs +++ b/src/dial.rs @@ -8,13 +8,12 @@ use druid::{ #[derive(Debug, Clone, Default)] pub struct Dial { // properties for the Dial - value: f64, size: Size, } impl Dial { - pub fn new(value: f64, size: Size) -> impl Widget<f64> { - Self { value, size } + pub fn new(size: Size) -> impl Widget<f64> { + Self { size } } } -- GitLab