Skip to content
Snippets Groups Projects
Commit 739b4969 authored by Per Lindgren's avatar Per Lindgren
Browse files

attack

parent 800baac5
No related branches found
No related tags found
No related merge requests found
...@@ -110,7 +110,7 @@ impl Envelope { ...@@ -110,7 +110,7 @@ impl Envelope {
#[derive(Debug)] #[derive(Debug)]
enum Area { enum Area {
Attac, Attack,
Decay, Decay,
Sustain, Sustain,
Release, Release,
...@@ -140,7 +140,7 @@ impl Widget<Envelope> for Draw { ...@@ -140,7 +140,7 @@ impl Widget<Envelope> for Draw {
match event { match event {
Event::MouseMoved(m) => { Event::MouseMoved(m) => {
self.current_area = if m.pos.x < a * x_scale { self.current_area = if m.pos.x < a * x_scale {
Area::Attac Area::Attack
} else if m.pos.x < (a + d) * x_scale { } else if m.pos.x < (a + d) * x_scale {
Area::Decay Area::Decay
} else if m.pos.x < (a + d + sustain_time) * x_scale { } else if m.pos.x < (a + d + sustain_time) * x_scale {
...@@ -162,7 +162,7 @@ impl Widget<Envelope> for Draw { ...@@ -162,7 +162,7 @@ impl Widget<Envelope> for Draw {
// set data // set data
let par = &mut match self.current_area { let par = &mut match self.current_area {
Area::Attac => &mut data.attack, Area::Attack => &mut data.attack,
Area::Decay => &mut data.decay, Area::Decay => &mut data.decay,
Area::Sustain => &mut data.sustain, Area::Sustain => &mut data.sustain,
Area::Release => &mut data.release, Area::Release => &mut data.release,
...@@ -179,7 +179,7 @@ impl Widget<Envelope> for Draw { ...@@ -179,7 +179,7 @@ impl Widget<Envelope> for Draw {
delta = delta / 10.0; delta = delta / 10.0;
}; };
let slope = &mut match self.current_area { let slope = &mut match self.current_area {
Area::Attac => &mut data.attack_slope, Area::Attack => &mut data.attack_slope,
Area::Decay => &mut data.decay_slope, Area::Decay => &mut data.decay_slope,
Area::Sustain => &mut data.sustain, Area::Sustain => &mut data.sustain,
Area::Release => &mut data.release, Area::Release => &mut data.release,
...@@ -229,7 +229,7 @@ impl Widget<Envelope> for Draw { ...@@ -229,7 +229,7 @@ impl Widget<Envelope> for Draw {
let y_scale = size.height; let y_scale = size.height;
let rect = match self.current_area { let rect = match self.current_area {
Area::Attac => Rect::from_points((0.0, 0.0), (a * x_scale, size.height)), Area::Attack => Rect::from_points((0.0, 0.0), (a * x_scale, size.height)),
Area::Decay => Rect::from_points((a * x_scale, 0.0), ((a + d) * x_scale, size.height)), Area::Decay => Rect::from_points((a * x_scale, 0.0), ((a + d) * x_scale, size.height)),
Area::Sustain => Rect::from_points( Area::Sustain => Rect::from_points(
((a + d) * x_scale, 0.0), ((a + d) * x_scale, 0.0),
...@@ -369,7 +369,7 @@ impl Adsr { ...@@ -369,7 +369,7 @@ impl Adsr {
Flex::column() Flex::column()
.with_child( .with_child(
Draw { Draw {
current_area: Area::Attac, current_area: Area::Attack,
} }
//.expand() // this would expand to the whole window //.expand() // this would expand to the whole window
.lens(Adsr::envelope) .lens(Adsr::envelope)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment