allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

automation drawing: stay in your lane and keep moving in the same direction

Browse Source
This commit is contained in:
Paul Davis
2023-07-09 18:12:08 -06:00
parent 86d5e2472c
commit e0c24f5bcf
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk2_ardour/editor_drag.cc
View File

@@ -7246,6 +7246,8 @@ AutomationDrawDrag::AutomationDrawDrag (Editor* editor, ArdourCanvas::Rectangle&
: Drag (editor, &r, time_domain)
, base_rect (r)
, dragging_line (nullptr)
, direction (0)
, edge_x (0)
{
DEBUG_TRACE (DEBUG::Drags, "New AutomationDrawDrag\n");
}
@@ -7268,18 +7270,40 @@ AutomationDrawDrag::motion (GdkEvent* ev, bool first_move)
dragging_line = new ArdourCanvas::PolyLine (item());
dragging_line->set_ignore_events (true);
dragging_line->set_outline_color (UIConfiguration::instance().color ("midi note selected outline"));
if (ev->motion.x > grab_x()) {
direction = 1;
} else {
direction = -1;
}
edge_x = grab_x ();
}
ArdourCanvas::Rect r = base_rect.item_to_canvas (base_rect.get());
dragging_line->add_point (ArdourCanvas::Duple (ev->motion.x - r.x0, ev->motion.y - r.y0));
double x = ev->motion.x - r.x0;
double y = ev->motion.y - r.y0;
x = std::max (0., x);
y = std::max (0., std::min (r.height(), y));
if (direction > 0) {
if ((ev->motion.x > edge_x) || (ev->motion.x == edge_x && ev->motion.y != last_pointer_y())) {
dragging_line->add_point (ArdourCanvas::Duple (x, y));
edge_x = x;
}
} else if (direction < 0) {
if ((ev->motion.x < edge_x) || (ev->motion.x == edge_x && ev->motion.y != last_pointer_y())) {
dragging_line->add_point (ArdourCanvas::Duple (x, y));
edge_x = x;
}
}
}
void
AutomationDrawDrag::finished (GdkEvent* event, bool motion_occured)
{
std::cerr << "ADD finished, mo " << motion_occured << std::endl;
if (!motion_occured) {
/* DragManager will tell editor that no motion happened, and
Editor::button_release_handler() will do the right thing.

2
gtk2_ardour/editor_drag.h
View File

@@ -1593,6 +1593,8 @@ class AutomationDrawDrag : public Drag
private:
ArdourCanvas::Rectangle& base_rect; /* we do not own this */
ArdourCanvas::PolyLine* dragging_line;
int direction;
int edge_x;
};
#endif /* __gtk2_ardour_editor_drag_h_ */