Replace Binding with two display properties
This commit is contained in:
Robbert van der Helm
parent
d8f8d545dd
commit
4f9a83860b
8
Cargo.lock
generated
8
Cargo.lock
generated
|
|
@ -3605,7 +3605,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vizia"
|
name = "vizia"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#dd14c83c4f70b19d00ae397dcc902cadd5464907"
|
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8247518a4d74d741ad27334fc48ba961f43134ff"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"vizia_baseview",
|
"vizia_baseview",
|
||||||
"vizia_core",
|
"vizia_core",
|
||||||
|
|
@ -3614,7 +3614,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vizia_baseview"
|
name = "vizia_baseview"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#dd14c83c4f70b19d00ae397dcc902cadd5464907"
|
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8247518a4d74d741ad27334fc48ba961f43134ff"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"baseview",
|
"baseview",
|
||||||
"femtovg",
|
"femtovg",
|
||||||
|
|
@ -3626,7 +3626,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vizia_core"
|
name = "vizia_core"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#dd14c83c4f70b19d00ae397dcc902cadd5464907"
|
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8247518a4d74d741ad27334fc48ba961f43134ff"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"copypasta",
|
"copypasta",
|
||||||
|
|
@ -3649,7 +3649,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vizia_derive"
|
name = "vizia_derive"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#dd14c83c4f70b19d00ae397dcc902cadd5464907"
|
source = "git+https://github.com/robbert-vdh/vizia.git?branch=feature/baseview-modifiers#8247518a4d74d741ad27334fc48ba961f43134ff"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|
|
||||||
|
|
@ -146,122 +146,113 @@ impl ParamSlider {
|
||||||
&& step_count.is_none()
|
&& step_count.is_none()
|
||||||
&& (0.45..=0.55).contains(&default_value);
|
&& (0.45..=0.55).contains(&default_value);
|
||||||
|
|
||||||
Binding::new(
|
let param_display_value_lens =
|
||||||
cx,
|
params.map(move |params| params_to_param(params).to_string());
|
||||||
ParamSliderInternal::text_input_active,
|
let param_preview_display_value_lens = |normalized_value| {
|
||||||
move |cx, text_input_active| {
|
params.map(move |params| {
|
||||||
let param_display_value_lens =
|
params_to_param(params).normalized_value_to_string(normalized_value, true)
|
||||||
params.map(move |params| params_to_param(params).to_string());
|
})
|
||||||
let param_preview_display_value_lens = |normalized_value| {
|
};
|
||||||
params.map(move |params| {
|
let normalized_param_value_lens =
|
||||||
params_to_param(params)
|
params.map(move |params| params_to_param(params).normalized_value());
|
||||||
.normalized_value_to_string(normalized_value, true)
|
|
||||||
})
|
|
||||||
};
|
|
||||||
let normalized_param_value_lens =
|
|
||||||
params.map(move |params| params_to_param(params).normalized_value());
|
|
||||||
|
|
||||||
// Only draw the text input widget when it gets focussed. Otherwise, overlay the
|
// Only draw the text input widget when it gets focussed. Otherwise, overlay the
|
||||||
// label with the slider.
|
// label with the slider. We need to always include the text input widget in the
|
||||||
if *text_input_active.get(cx) {
|
// tree because using a `Binding` here would cause the text box to get recreated
|
||||||
Textbox::new(cx, param_display_value_lens)
|
// whenever `ParamSliderInternal::text_input_active` changes.
|
||||||
.class("value-entry")
|
Textbox::new(cx, param_display_value_lens.clone())
|
||||||
.on_submit(|cx, string| {
|
.class("value-entry")
|
||||||
cx.emit(ParamSliderEvent::TextInput(string))
|
.on_submit(|cx, string| cx.emit(ParamSliderEvent::TextInput(string)))
|
||||||
})
|
.on_focus_out(|cx| cx.emit(ParamSliderEvent::CancelTextInput))
|
||||||
.on_focus_out(|cx| cx.emit(ParamSliderEvent::CancelTextInput))
|
.display(ParamSliderInternal::text_input_active)
|
||||||
.child_space(Stretch(1.0))
|
.child_space(Stretch(1.0))
|
||||||
.height(Stretch(1.0))
|
.height(Stretch(1.0))
|
||||||
.width(Stretch(1.0));
|
.width(Stretch(1.0));
|
||||||
} else {
|
|
||||||
ZStack::new(cx, move |cx| {
|
// This only gets shown when the text box isn't active
|
||||||
// The filled bar portion. This can be visualized in a couple different
|
ZStack::new(cx, move |cx| {
|
||||||
// ways depending on the current style property. See
|
// The filled bar portion. This can be visualized in a couple different
|
||||||
// [`ParamSliderStyle`].
|
// ways depending on the current style property. See
|
||||||
Element::new(cx)
|
// [`ParamSliderStyle`].
|
||||||
.class("fill")
|
Element::new(cx)
|
||||||
|
.class("fill")
|
||||||
|
.height(Stretch(1.0))
|
||||||
|
.bind(normalized_param_value_lens, move |handle, value| {
|
||||||
|
let current_value = *value.get(handle.cx);
|
||||||
|
let (start_t, delta) = match style {
|
||||||
|
ParamSliderStyle::Centered if draw_fill_from_default => {
|
||||||
|
let delta = (default_value - current_value).abs();
|
||||||
|
(
|
||||||
|
default_value.min(current_value),
|
||||||
|
// Don't draw the filled portion at all if it could have been a
|
||||||
|
// rounding error since those slivers just look weird
|
||||||
|
if delta >= 1e-3 { delta } else { 0.0 },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
ParamSliderStyle::Centered | ParamSliderStyle::FromLeft => {
|
||||||
|
(0.0, current_value)
|
||||||
|
}
|
||||||
|
ParamSliderStyle::CurrentStep
|
||||||
|
| ParamSliderStyle::CurrentStepLabeled => {
|
||||||
|
let previous_step = unsafe {
|
||||||
|
param_ptr.previous_normalized_step(current_value)
|
||||||
|
};
|
||||||
|
let next_step =
|
||||||
|
unsafe { param_ptr.next_normalized_step(current_value) };
|
||||||
|
(
|
||||||
|
(previous_step + current_value) / 2.0,
|
||||||
|
(next_step + current_value) / 2.0,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
handle
|
||||||
|
.left(Percentage(start_t * 100.0))
|
||||||
|
.width(Percentage(delta * 100.0));
|
||||||
|
})
|
||||||
|
// Hovering is handled on the param slider as a whole, this should
|
||||||
|
// not affect that
|
||||||
|
.hoverable(false);
|
||||||
|
|
||||||
|
// Either display the current value, or display all values over the
|
||||||
|
// parameter's steps
|
||||||
|
// TODO: Do the same thing as in the iced widget where we draw the
|
||||||
|
// text overlapping the fill area slightly differently. We can
|
||||||
|
// set the cip region directly in vizia.
|
||||||
|
match (style, step_count) {
|
||||||
|
(ParamSliderStyle::CurrentStepLabeled, Some(step_count)) => {
|
||||||
|
HStack::new(cx, |cx| {
|
||||||
|
// There are step_count + 1 possible values for a
|
||||||
|
// discrete parameter
|
||||||
|
for value in 0..step_count + 1 {
|
||||||
|
let normalized_value = value as f32 / step_count as f32;
|
||||||
|
Label::new(
|
||||||
|
cx,
|
||||||
|
param_preview_display_value_lens(normalized_value),
|
||||||
|
)
|
||||||
|
.class("value")
|
||||||
|
.class("value--multiple")
|
||||||
.height(Stretch(1.0))
|
.height(Stretch(1.0))
|
||||||
.bind(normalized_param_value_lens, move |handle, value| {
|
.width(Stretch(1.0))
|
||||||
let current_value = *value.get(handle.cx);
|
|
||||||
let (start_t, delta) = match style {
|
|
||||||
ParamSliderStyle::Centered
|
|
||||||
if draw_fill_from_default =>
|
|
||||||
{
|
|
||||||
let delta = (default_value - current_value).abs();
|
|
||||||
(
|
|
||||||
default_value.min(current_value),
|
|
||||||
// Don't draw the filled portion at all if it could have been a
|
|
||||||
// rounding error since those slivers just look weird
|
|
||||||
if delta >= 1e-3 { delta } else { 0.0 },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
ParamSliderStyle::Centered
|
|
||||||
| ParamSliderStyle::FromLeft => (0.0, current_value),
|
|
||||||
ParamSliderStyle::CurrentStep
|
|
||||||
| ParamSliderStyle::CurrentStepLabeled => {
|
|
||||||
let previous_step = unsafe {
|
|
||||||
param_ptr
|
|
||||||
.previous_normalized_step(current_value)
|
|
||||||
};
|
|
||||||
let next_step = unsafe {
|
|
||||||
param_ptr.next_normalized_step(current_value)
|
|
||||||
};
|
|
||||||
(
|
|
||||||
(previous_step + current_value) / 2.0,
|
|
||||||
(next_step + current_value) / 2.0,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
handle
|
|
||||||
.left(Percentage(start_t * 100.0))
|
|
||||||
.width(Percentage(delta * 100.0));
|
|
||||||
})
|
|
||||||
// Hovering is handled on the param slider as a whole, this should
|
|
||||||
// not affect that
|
|
||||||
.hoverable(false);
|
.hoverable(false);
|
||||||
|
}
|
||||||
// Either display the current value, or display all values over the
|
|
||||||
// parameter's steps
|
|
||||||
match (style, step_count) {
|
|
||||||
(ParamSliderStyle::CurrentStepLabeled, Some(step_count)) => {
|
|
||||||
HStack::new(cx, |cx| {
|
|
||||||
// There are step_count + 1 possible values for a
|
|
||||||
// discrete parameter
|
|
||||||
for value in 0..step_count + 1 {
|
|
||||||
let normalized_value =
|
|
||||||
value as f32 / step_count as f32;
|
|
||||||
Label::new(
|
|
||||||
cx,
|
|
||||||
param_preview_display_value_lens(
|
|
||||||
normalized_value,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.class("value")
|
|
||||||
.class("value--multiple")
|
|
||||||
.height(Stretch(1.0))
|
|
||||||
.width(Stretch(1.0))
|
|
||||||
.hoverable(false);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.height(Stretch(1.0))
|
|
||||||
.width(Stretch(1.0))
|
|
||||||
.hoverable(false);
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
Label::new(cx, param_display_value_lens)
|
|
||||||
.class("value")
|
|
||||||
.class("value--single")
|
|
||||||
.height(Stretch(1.0))
|
|
||||||
.width(Stretch(1.0))
|
|
||||||
.hoverable(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
})
|
})
|
||||||
|
.height(Stretch(1.0))
|
||||||
|
.width(Stretch(1.0))
|
||||||
.hoverable(false);
|
.hoverable(false);
|
||||||
}
|
}
|
||||||
},
|
_ => {
|
||||||
);
|
Label::new(cx, param_display_value_lens)
|
||||||
|
.class("value")
|
||||||
|
.class("value--single")
|
||||||
|
.height(Stretch(1.0))
|
||||||
|
.width(Stretch(1.0))
|
||||||
|
.hoverable(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.display(ParamSliderInternal::text_input_active.map(|active| !active))
|
||||||
|
.hoverable(false);
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue