smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

cue editor end dragging operational

Browse source
This commit is contained in:
Paul Davis 2024-11-26 13:11:17 -07:00
parent af0162c73c
commit 2096ff7876
4 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gtk2_ardour/editor_drag.cc
View file

@ -7547,7 +7547,6 @@ ClipStartDrag::ClipStartDrag (EditingContext& ec, ArdourCanvas::Rectangle& r, Mi
, mce (m)
, dragging_rect (&r)
, original_rect (r.get())
, _cumulative_dx (0)
{
}
@ -7595,7 +7594,6 @@ ClipStartDrag::finished (GdkEvent* event, bool movement_occured)
timepos_t pos = adjusted_current_time (event);
editing_context.snap_to_with_modifier (pos, event, Temporal::RoundNearest, ARDOUR::SnapToGrid_Scaled, true);
std::cerr << "drag to " << pos.beats().str() << std::endl;
mce.set_trigger_start (pos);
}
@ -7605,10 +7603,11 @@ ClipStartDrag::aborted (bool)
dragging_rect->set (original_rect);
}
ClipEndDrag::ClipEndDrag (EditingContext& ec, ArdourCanvas::Rectangle& r, Temporal::timepos_t const & oe)
: Drag (ec, &r, oe.time_domain(), nullptr, false)
ClipEndDrag::ClipEndDrag (EditingContext& ec, ArdourCanvas::Rectangle& r, MidiCueEditor& m)
: Drag (ec, &r, Temporal::BeatTime, nullptr, false)
, mce (m)
, dragging_rect (&r)
, original_end (oe)
, original_rect (r.get())
{
}
@ -7632,14 +7631,35 @@ ClipEndDrag::end_grab (GdkEvent* ev)
void
ClipEndDrag::motion (GdkEvent*, bool)
{
ArdourCanvas::Rect r (original_rect);
double pix = current_pointer_x();
double crx1 = dragging_rect->item_to_canvas (Duple (r.x0, 0.)).x;
if (pix > editing_context.timeline_origin()) {
r.x0 = dragging_rect->parent()->canvas_to_item (Duple (pix, 0.0)).x;
} else {
r.x0 = r.x1 - 1.;
}
dragging_rect->set (r);
}
void
ClipEndDrag::finished (GdkEvent*, bool)
ClipEndDrag::finished (GdkEvent* event, bool movement_occured)
{
if (!movement_occured) {
dragging_rect->set (original_rect);
return;
}
timepos_t pos = adjusted_current_time (event);
editing_context.snap_to_with_modifier (pos, event, Temporal::RoundNearest, ARDOUR::SnapToGrid_Scaled, true);
mce.set_trigger_end (pos);
}
void
ClipEndDrag::aborted (bool)
{
dragging_rect->set (original_rect);
}