insanely complex fixes for dragging to and from the drop zone.

This probably breaks some of ardour's functionality (e.g. layered mode), but seems to
be either just right or very close to it for tracks

Conflicts:
	gtk2_ardour/editor_routes.cc

1 files changed, 10 insertions, 1 deletions

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index c7ad7c54ff..30082adec4 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -515,8 +515,17 @@ EditorRoutes::redisplay_real ()
 			continue;
 		}
 
+		if (route->is_master()) {
+			
+			tv->hide(); // never show master bus
+			if (_editor->master_bus_ui ()) {
+				_editor->master_bus_ui ()->set_route (route);
+			}
+			continue;
+		}
+		
 		bool visible = tv->marked_for_display ();
-
+		
 		/* show or hide the TimeAxisView */
 		if (visible) {
 			position += tv->show_at (position, n, &_editor->edit_controls_vbox);