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

Merge branch 'Ardour:master' into master

Browse source
This commit is contained in:
Aaron Brewbaker 2025-11-23 18:09:21 -05:00 • committed by GitHub
commit 7d9c3822d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/editor_drag.cc
View file

@ -7533,11 +7533,16 @@ FreehandLineDrag<OrderedPointList,OrderedPoint>::maybe_add_point (GdkEvent* ev,
} }
if (child_call) { if (child_call) {
/* Coordinates passed to these two methods use *canvas*
* coordinate space for the x-axis
*/
x = editing_context.timeline_to_canvas (timeline_x); x = editing_context.timeline_to_canvas (timeline_x);
if (straight_line && !first_move) { if (straight_line && !first_move) {
line_extended (ArdourCanvas::Duple (line_start_x, line_start_y), ArdourCanvas::Duple (x, y), base_rect, first_move ? -1 : edge_x); line_extended (ArdourCanvas::Duple (line_start_x, line_start_y), ArdourCanvas::Duple (x, y), base_rect, first_move ? -1 : x);
} else { } else {
point_added (ArdourCanvas::Duple (x, y), base_rect, first_move ? -1 : edge_x); point_added (ArdourCanvas::Duple (x, y), base_rect, first_move ? -1 : editing_context.timeline_to_canvas (edge_x));
} }
} }

2
gtk2_ardour/velocity_display.cc
View file

@ -87,7 +87,7 @@ VelocityDisplay::line_draw_motion (ArdourCanvas::Duple const & d, ArdourCanvas::
std::vector<GhostEvent*> affected_lollis; std::vector<GhostEvent*> affected_lollis;
if (last_x < 0) { if (last_x < 0) {
lollis_close_to_x (d.x, 20., affected_lollis); lollis_close_to_x (d.x, 10., affected_lollis);
} else if (last_x < d.x) { } else if (last_x < d.x) {
/* rightward, "later" motion */ /* rightward, "later" motion */
lollis_between (last_x, d.x, affected_lollis); lollis_between (last_x, d.x, affected_lollis);