alex/nih-plug
1
0
Fork 0
Code Activity

Fix Shift+drag start behavior for iced and vizia

Browse source 
The previous calculation was incorrect as it would cause the value to
jump a bit.
This commit is contained in:
Robbert van der Helm 2022-03-19 02:18:30 +01:00
parent 92908e0232
commit 2e18ae0ebc
2 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nih_plug_iced/src/widgets/param_slider.rs
View file

@ -48,9 +48,9 @@ pub struct State {
/// Will be set to `true` if we're dragging the parameter. Resetting the parameter or entering a /// Will be set to `true` if we're dragging the parameter. Resetting the parameter or entering a
/// text value should not initiate a drag. /// text value should not initiate a drag.
drag_active: bool, drag_active: bool,
/// We keep track of the start coordinate holding down Shift while dragging for higher precision /// We keep track of the start coordinate and normalized value holding down Shift while dragging
/// dragging. This is a `None` value when granular dragging is not active. /// for higher precision dragging. This is a `None` value when granular dragging is not active.
granular_drag_start_x: Option<f32>, granular_drag_start_x_value: Option<(f32, f32)>,
/// Track clicks for double clicks. /// Track clicks for double clicks.
last_click: Option<mouse::Click>, last_click: Option<mouse::Click>,
@ -332,8 +332,8 @@ impl<'a, P: Param> Widget<ParamMessage, Renderer> for ParamSlider<'a, P> {
// When holding down shift while clicking on a parameter we want to // When holding down shift while clicking on a parameter we want to
// granuarly edit the parameter without jumping to a new value // granuarly edit the parameter without jumping to a new value
self.state.granular_drag_start_x = self.state.granular_drag_start_x_value =
Some(util::remap_rect_x_t(&bounds, self.param.normalized_value())); Some((cursor_position.x, self.param.normalized_value()));
} else { } else {
shell.publish(ParamMessage::BeginSetParameter(self.param.as_ptr())); shell.publish(ParamMessage::BeginSetParameter(self.param.as_ptr()));
self.state.drag_active = true; self.state.drag_active = true;
@ -342,7 +342,7 @@ impl<'a, P: Param> Widget<ParamMessage, Renderer> for ParamSlider<'a, P> {
shell, shell,
util::remap_rect_x_coordinate(&bounds, cursor_position.x), util::remap_rect_x_coordinate(&bounds, cursor_position.x),
); );
self.state.granular_drag_start_x = None; self.state.granular_drag_start_x_value = None;
} }
return event::Status::Captured; return event::Status::Captured;
@ -365,21 +365,23 @@ impl<'a, P: Param> Widget<ParamMessage, Renderer> for ParamSlider<'a, P> {
// If shift is being held then the drag should be more granular instead of // If shift is being held then the drag should be more granular instead of
// absolute // absolute
if self.state.keyboard_modifiers.shift() { if self.state.keyboard_modifiers.shift() {
let drag_start_x = *self let (drag_start_x, drag_start_value) = *self
.state .state
.granular_drag_start_x .granular_drag_start_x_value
.get_or_insert(cursor_position.x); .get_or_insert_with(|| {
(cursor_position.x, self.param.normalized_value())
});
self.set_normalized_value( self.set_normalized_value(
shell, shell,
util::remap_rect_x_coordinate( util::remap_rect_x_coordinate(
&bounds, &bounds,
drag_start_x util::remap_rect_x_t(&bounds, drag_start_value)
+ (cursor_position.x - drag_start_x) * GRANULAR_DRAG_MULTIPLIER, + (cursor_position.x - drag_start_x) * GRANULAR_DRAG_MULTIPLIER,
), ),
); );
} else { } else {
self.state.granular_drag_start_x = None; self.state.granular_drag_start_x_value = None;
self.set_normalized_value( self.set_normalized_value(
shell, shell,
@ -396,10 +398,10 @@ impl<'a, P: Param> Widget<ParamMessage, Renderer> for ParamSlider<'a, P> {
// If this happens while dragging, snap back to reality uh I mean the current screen // If this happens while dragging, snap back to reality uh I mean the current screen
// position // position
if self.state.drag_active if self.state.drag_active
&& self.state.granular_drag_start_x.is_some() && self.state.granular_drag_start_x_value.is_some()
&& !modifiers.shift() && !modifiers.shift()
{ {
self.state.granular_drag_start_x = None; self.state.granular_drag_start_x_value = None;
self.set_normalized_value( self.set_normalized_value(
shell, shell,

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

@ -28,9 +28,10 @@ pub struct ParamSlider {
/// Whether the next click is a double click. Vizia will send a double click event followed by a /// Whether the next click is a double click. Vizia will send a double click event followed by a
/// regular mouse down event when double clicking. /// regular mouse down event when double clicking.
is_double_click: bool, is_double_click: bool,
/// We keep track of the start coordinate holding down Shift while dragging for higher precision /// We keep track of the start coordinate and normalized value when holding down Shift while
/// dragging. This is a `None` value when granular dragging is not active. /// dragging for higher precision dragging. This is a `None` value when granular dragging is not
granular_drag_start_x: Option<f32>, /// active.
granular_drag_start_x_value: Option<(f32, f32)>,
} }
impl ParamSlider { impl ParamSlider {
@ -82,7 +83,7 @@ impl ParamSlider {
drag_active: false, drag_active: false,
is_double_click: false, is_double_click: false,
granular_drag_start_x: None, granular_drag_start_x_value: None,
} }
.build2(cx, |cx| { .build2(cx, |cx| {
ZStack::new(cx, move |cx| { ZStack::new(cx, move |cx| {
@ -165,9 +166,11 @@ impl View for ParamSlider {
// granuarly edit the parameter without jumping to a new value // granuarly edit the parameter without jumping to a new value
cx.emit(RawParamEvent::BeginSetParameter(self.param_ptr)); cx.emit(RawParamEvent::BeginSetParameter(self.param_ptr));
if cx.modifiers.shift() { if cx.modifiers.shift() {
self.granular_drag_start_x = Some(cx.mouse.cursorx); self.granular_drag_start_x_value = Some((cx.mouse.cursorx, unsafe {
self.param_ptr.normalized_value()
}));
} else { } else {
self.granular_drag_start_x = None; self.granular_drag_start_x_value = None;
self.set_normalized_value( self.set_normalized_value(
cx, cx,
util::remap_current_entity_x_coordinate(cx, cx.mouse.cursorx), util::remap_current_entity_x_coordinate(cx, cx.mouse.cursorx),
@ -194,18 +197,24 @@ impl View for ParamSlider {
// If shift is being held then the drag should be more granular instead of // If shift is being held then the drag should be more granular instead of
// absolute // absolute
if cx.modifiers.shift() { if cx.modifiers.shift() {
let drag_start_x = let (drag_start_x, drag_start_value) =
*self.granular_drag_start_x.get_or_insert(cx.mouse.cursorx); *self.granular_drag_start_x_value.get_or_insert_with(|| {
(cx.mouse.cursorx, unsafe {
self.param_ptr.normalized_value()
})
});
self.set_normalized_value( self.set_normalized_value(
cx, cx,
util::remap_current_entity_x_coordinate( util::remap_current_entity_x_coordinate(
cx, cx,
drag_start_x + (*x - drag_start_x) * GRANULAR_DRAG_MULTIPLIER, // This can be optimized a bit
util::remap_current_entity_x_t(cx, drag_start_value)
+ (*x - drag_start_x) * GRANULAR_DRAG_MULTIPLIER,
), ),
); );
} else { } else {
self.granular_drag_start_x = None; self.granular_drag_start_x_value = None;
self.set_normalized_value( self.set_normalized_value(
cx, cx,
@ -217,8 +226,8 @@ impl View for ParamSlider {
WindowEvent::KeyUp(_, Some(Key::Shift)) => { WindowEvent::KeyUp(_, Some(Key::Shift)) => {
// If this happens while dragging, snap back to reality uh I mean the current screen // If this happens while dragging, snap back to reality uh I mean the current screen
// position // position
if self.drag_active && self.granular_drag_start_x.is_some() { if self.drag_active && self.granular_drag_start_x_value.is_some() {
self.granular_drag_start_x = None; self.granular_drag_start_x_value = None;
self.set_normalized_value( self.set_normalized_value(
cx, cx,
util::remap_current_entity_x_coordinate(cx, cx.mouse.cursorx), util::remap_current_entity_x_coordinate(cx, cx.mouse.cursorx),