Fix confusion between model and view points when dragging ranges. Clamp both top and bottom when dragging vertically. Fix some wacky formatting.

git-svn-id: svn://localhost/ardour2/branches/3.0@6436 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 3 deletions

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index ac50ac44db..7286b20bdf 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -770,12 +770,17 @@ AutomationLine::drag_motion (nframes_t x, float fraction, bool with_push)
 	double dy = fraction - _last_drag_fraction;
 	_last_drag_fraction = fraction;
 
-	/* clamp y so that the "lowest" point hits the bottom but goes no further */
+	/* clamp y so that the "lowest" point hits the bottom but goes no further
+	   and similarly with the "highest" and the top
+	*/
 	for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
 		double const y = ((_height - (*i)->get_y()) / _height) + dy;
 		if (y < 0) {
 			dy -= y;
 		}
+		if (y > 1) {
+			dy -= (y - 1);
+		}
 	}
 
 	for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
@@ -1072,8 +1077,9 @@ AutomationLine::set_selected_points (PointSelection& points)
 
 }
 
-void AutomationLine::set_colors() {
-	set_line_color( ARDOUR_UI::config()->canvasvar_AutomationLine.get() );
+void AutomationLine::set_colors()
+{
+	set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 		(*i)->show_color (false, !points_visible);
 	}