X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=bbe5a1a5b3957137c34d31768f3383a8157f4156;hb=37937d9c698e5fe9ce0f1857f3256dead43f3ebc;hp=2609abadc84c2779f687211730a9821a217f2aab;hpb=7b8fd17719e7b5bdd6a59e0ce4d9bf5c4d0773a4;p=ardour.git

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 2609abadc8..bbe5a1a5b3 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -100,7 +100,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 			current_stepping_trackview->step_height (false);
 			return true;
 		} else {
-			scroll_tracks_up_line ();
+			scroll_up_one_track ();
 			return true;
 		}
 		break;
@@ -129,7 +129,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 			current_stepping_trackview->step_height (true);
 			return true;
 		} else {
-			scroll_tracks_down_line ();
+			scroll_down_one_track ();
 			return true;
 		}
 		break;
@@ -1085,12 +1085,6 @@ Editor::canvas_playhead_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
 	return typed_event (item, event, PlayheadCursorItem);
 }
 
-bool
-Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item)
-{
-	return typed_event (item, event, NoItem);
-}
-
 bool
 Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
@@ -1126,6 +1120,12 @@ Editor::canvas_drop_zone_event (GdkEvent* event)
 		return canvas_scroll_event (&scroll, true);
 		break;
 
+	case GDK_ENTER_NOTIFY:
+		return typed_event (_canvas_drop_zone, event, DropZoneItem);
+
+	case GDK_LEAVE_NOTIFY:
+		return typed_event (_canvas_drop_zone, event, DropZoneItem);
+
 	default:
 		break;
 	}
@@ -1157,7 +1157,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
 
 	(void) window_event_sample (&event, &px, &py);
 
-	std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
+	std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py, false);
 	bool can_drop = false;
 	
 	if (tv.first != 0) {