alex/nih-plug
1
0
Fork 0
Code Activity

Prevent rustfmt from breaking

Browse source 
It didn't like the comment in the middle of a pattern.
This commit is contained in:
Robbert van der Helm 2022-11-06 19:45:34 +01:00
parent a73f76fbcf
commit 3a22b12d8f
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
nih_plug_vizia/src/widgets/param_slider.rs
View file

@ -384,11 +384,11 @@ impl View for ParamSlider {
}); });
event.map(|window_event, meta| match window_event { event.map(|window_event, meta| match window_event {
WindowEvent::MouseDown(MouseButton::Left)
// Vizia always captures the third mouse click as a triple click. Treating that triple // Vizia always captures the third mouse click as a triple click. Treating that triple
// click as a regular mouse button makes double click followed by another drag work as // click as a regular mouse button makes double click followed by another drag work as
// expected, instead of requiring a delay or an additional click. Double double click // expected, instead of requiring a delay or an additional click. Double double click
// still won't work. // still won't work.
WindowEvent::MouseDown(MouseButton::Left)
| WindowEvent::MouseTripleClick(MouseButton::Left) => { | WindowEvent::MouseTripleClick(MouseButton::Left) => {
if cx.modifiers.alt() { if cx.modifiers.alt() {
// ALt+Click brings up a text entry dialog // ALt+Click brings up a text entry dialog
@ -397,9 +397,10 @@ impl View for ParamSlider {
} else if cx.modifiers.command() { } else if cx.modifiers.command() {
// Ctrl+Click and double click should reset the parameter instead of initiating // Ctrl+Click and double click should reset the parameter instead of initiating
// a drag operation // a drag operation
self.param_base.begin_set_parameter(cx); self.param_base.begin_set_parameter(cx);
self.param_base.set_normalized_value(cx, self.param_base.default_normalized_value()); self.param_base
self.param_base.end_set_parameter(cx); .set_normalized_value(cx, self.param_base.default_normalized_value());
self.param_base.end_set_parameter(cx);
} else { } else {
self.drag_active = true; self.drag_active = true;
cx.capture(); cx.capture();
@ -411,8 +412,10 @@ impl View for ParamSlider {
// edit the parameter without jumping to a new value // edit the parameter without jumping to a new value
self.param_base.begin_set_parameter(cx); self.param_base.begin_set_parameter(cx);
if cx.modifiers.shift() { if cx.modifiers.shift() {
self.granular_drag_start_x_value = Some((cx.mouse.cursorx, self.param_base.unmodulated_normalized_value() self.granular_drag_start_x_value = Some((
)); cx.mouse.cursorx,
self.param_base.unmodulated_normalized_value(),
));
} else { } else {
self.granular_drag_start_x_value = None; self.granular_drag_start_x_value = None;
self.set_normalized_value_drag( self.set_normalized_value_drag(
@ -428,7 +431,8 @@ impl View for ParamSlider {
// Ctrl+Click and double click should reset the parameter instead of initiating // Ctrl+Click and double click should reset the parameter instead of initiating
// a drag operation // a drag operation
self.param_base.begin_set_parameter(cx); self.param_base.begin_set_parameter(cx);
self.param_base.set_normalized_value(cx, self.param_base.default_normalized_value()); self.param_base
.set_normalized_value(cx, self.param_base.default_normalized_value());
self.param_base.end_set_parameter(cx); self.param_base.end_set_parameter(cx);
meta.consume(); meta.consume();
@ -451,8 +455,10 @@ impl View for ParamSlider {
if cx.modifiers.shift() { if cx.modifiers.shift() {
let (drag_start_x, drag_start_value) = let (drag_start_x, drag_start_value) =
*self.granular_drag_start_x_value.get_or_insert_with(|| { *self.granular_drag_start_x_value.get_or_insert_with(|| {
(cx.mouse.cursorx, self.param_base.unmodulated_normalized_value() (
) cx.mouse.cursorx,
self.param_base.unmodulated_normalized_value(),
)
}); });
self.set_normalized_value_drag( self.set_normalized_value_drag(
@ -479,7 +485,10 @@ impl View for ParamSlider {
// position // position
if self.drag_active && self.granular_drag_start_x_value.is_some() { if self.drag_active && self.granular_drag_start_x_value.is_some() {
self.granular_drag_start_x_value = None; self.granular_drag_start_x_value = None;
self.param_base.set_normalized_value(cx, util::remap_current_entity_x_coordinate(cx, cx.mouse.cursorx)); self.param_base.set_normalized_value(
cx,
util::remap_current_entity_x_coordinate(cx, cx.mouse.cursorx),
);
} }
} }
_ => {} _ => {}