X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fscroomer.cc;h=23fa71718ba0ddb1d24577552f1f5435199519d4;hb=68146a09698772eaaab2b3a46cb1c9866acb4200;hp=85092379f495b79f728bffb22c98a65f6135fd70;hpb=e55780afbd49e79fa8e3eaad0448904b158ba5e0;p=ardour.git

diff --git a/libs/gtkmm2ext/scroomer.cc b/libs/gtkmm2ext/scroomer.cc
index 85092379f4..23fa71718b 100644
--- a/libs/gtkmm2ext/scroomer.cc
+++ b/libs/gtkmm2ext/scroomer.cc
@@ -74,6 +74,10 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev)
 		return true;
 	}
 
+	if (ev->y < 0 || ev->y > get_height ()) {
+		return true;
+	}
+
 	grab_y = ev->y;
 
 	if (ev->state & Keyboard::PrimaryModifier) {
@@ -138,10 +142,11 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev)
 
 	/* Then we handle zoom, which is dragging horizontally. We zoom around the area that is
 	 * the current y pointer value, not from the area that was the start of the drag.
-	 * the point of zoom must have the same 
+	 * We don't start doing zoom until we are at least one scroomer width outside the scroomer's
+	 * area.
 	 */
 	
-	if (ev->x > get_width()) {
+	if (ev->x > (get_width() * 2)) {
 		zoom = ev->x - get_width();
 		
 		double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer;
@@ -165,9 +170,9 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev)
 		page = min(page, adj.get_upper() - val);
 	} else if (ev->x < 0) {
 		/* on zoom out increase the page size as well as moving the range towards the mouse pos*/
-		zoom = abs(ev->x);
+		/*zoom = abs(ev->x);
 
-		/*double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer;
+		double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer;
 		double lower = val_at_pointer - (unzoomed_val + half_min_page);
 
 		higher *= zoom / 128;
@@ -194,9 +199,10 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev)
 		val = unzoomed_val;
 		page = unzoomed_page;
 	}
-	
-	adj.set_page_size(page);
-	adj.set_value(val);
+
+	/* Round these values to stop the scroomer handlers quivering about during drags */
+	adj.set_page_size (rint (page));
+	adj.set_value (rint (val));
 	adj.value_changed();
 	
 	return true;
@@ -207,7 +213,7 @@ Scroomer::on_scroll_event (GdkEventScroll* ev)
 {
 	switch (ev->direction) {
 	case GDK_SCROLL_UP:
-		adj.set_value (adj.get_value() + adj.get_page_size() / 10.0);
+		adj.set_value (min (adj.get_value() + adj.get_page_size() / 10.0, adj.get_upper() - adj.get_page_size()));
 		break;
 	case GDK_SCROLL_DOWN:
 		adj.set_value (adj.get_value() - adj.get_page_size() / 10.0);
@@ -245,7 +251,11 @@ Scroomer::on_button_press_event (GdkEventButton* ev)
 		DragStarting (); /* EMIT SIGNAL */
 	}
 	
-	return false;
+	if (ev->type == GDK_2BUTTON_PRESS && ev->button == 1) {
+		DoubleClicked();
+	}
+
+	return true;
 }
 
 bool