followup to the previous tempo-dragging commit: use argument to Drag::aborted() to...
[ardour.git] / gtk2_ardour / editor_summary.cc
index d4ced9dd2697432ec86709197ea5e4077e29df9b..8de492ddec5e61efeae862bd28186e1dfda9dda8 100644 (file)
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "keyboard.h"
+#include "editor_routes.h"
+#include "editor_cursors.h"
+#include "mouse_cursors.h"
+#include "route_time_axis.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -44,11 +48,15 @@ EditorSummary::EditorSummary (Editor* e)
          _last_playhead (-1),
          _move_dragging (false),
          _moved (false),
-         _zoom_dragging (false)
-
+         _view_rectangle_x (0, 0),
+         _view_rectangle_y (0, 0),
+         _zoom_dragging (false),
+         _old_follow_playhead (false)
 {
        Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
        _editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), ui_bind (&EditorSummary::playhead_position_changed, this, _1), gui_context());
+
+       add_events (Gdk::POINTER_MOTION_MASK);
 }
 
 /** Connect to a session.
@@ -57,7 +65,7 @@ EditorSummary::EditorSummary (Editor* e)
 void
 EditorSummary::set_session (Session* s)
 {
-       EditorComponent::set_session (s);
+       SessionHandlePtr::set_session (s);
 
        set_dirty ();
 
@@ -86,17 +94,20 @@ EditorSummary::on_expose_event (GdkEventExpose* event)
 
        cairo_t* cr = gdk_cairo_create (get_window()->gobj());
 
-       /* Render the view rectangle */
+       /* Render the view rectangle.  If there is an editor visual pending, don't update
+          the view rectangle now --- wait until the expose event that we'll get after
+          the visual change.  This prevents a flicker.
+       */
 
-       pair<double, double> x;
-       pair<double, double> y;
-       get_editor (&x, &y);
+       if (_editor->pending_visual_change.idle_handler_id < 0) {
+               get_editor (&_view_rectangle_x, &_view_rectangle_y);
+       }
 
-       cairo_move_to (cr, x.first, y.first);
-       cairo_line_to (cr, x.second, y.first);
-       cairo_line_to (cr, x.second, y.second);
-       cairo_line_to (cr, x.first, y.second);
-       cairo_line_to (cr, x.first, y.first);
+       cairo_move_to (cr, _view_rectangle_x.first, _view_rectangle_y.first);
+       cairo_line_to (cr, _view_rectangle_x.second, _view_rectangle_y.first);
+       cairo_line_to (cr, _view_rectangle_x.second, _view_rectangle_y.second);
+       cairo_line_to (cr, _view_rectangle_x.first, _view_rectangle_y.second);
+       cairo_line_to (cr, _view_rectangle_x.first, _view_rectangle_y.first);
        cairo_set_source_rgba (cr, 1, 1, 1, 0.25);
        cairo_fill_preserve (cr);
        cairo_set_line_width (cr, 1);
@@ -111,7 +122,7 @@ EditorSummary::on_expose_event (GdkEventExpose* event)
 
        double const p = (_editor->playhead_cursor->current_frame - _start) * _x_scale;
        cairo_move_to (cr, p, 0);
-       cairo_line_to (cr, p, _height);
+       cairo_line_to (cr, p, get_height());
        cairo_stroke (cr);
        _last_playhead = p;
 
@@ -129,7 +140,7 @@ EditorSummary::render (cairo_t* cr)
        /* background */
 
        cairo_set_source_rgb (cr, 0, 0, 0);
-       cairo_rectangle (cr, 0, 0, _width, _height);
+       cairo_rectangle (cr, 0, 0, get_width(), get_height());
        cairo_fill (cr);
 
        if (_session == 0) {
@@ -137,23 +148,29 @@ EditorSummary::render (cairo_t* cr)
        }
 
        /* compute start and end points for the summary */
-       
-       nframes_t const session_length = _session->current_end_frame() - _session->current_start_frame ();
+
+       framecnt_t const session_length = _session->current_end_frame() - _session->current_start_frame ();
        double const theoretical_start = _session->current_start_frame() - session_length * _overhang_fraction;
        _start = theoretical_start > 0 ? theoretical_start : 0;
        _end = _session->current_end_frame() + session_length * _overhang_fraction;
 
        /* compute track height */
-       size_t const N = _editor->track_views.size ();
+       int N = 0;
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+               if (!(*i)->hidden()) {
+                       ++N;
+               }
+       }
+
        if (N == 0) {
                _track_height = 16;
        } else {
-               _track_height = (double) _height / N;
+               _track_height = (double) get_height() / N;
        }
 
        /* calculate x scale */
        if (_end != _start) {
-               _x_scale = static_cast<double> (_width) / (_end - _start);
+               _x_scale = static_cast<double> (get_width()) / (_end - _start);
        } else {
                _x_scale = 1;
        }
@@ -163,12 +180,16 @@ EditorSummary::render (cairo_t* cr)
        double y = 0;
        for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
 
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
                cairo_set_source_rgb (cr, 0.2, 0.2, 0.2);
                cairo_set_line_width (cr, _track_height - 2);
                cairo_move_to (cr, 0, y + _track_height / 2);
-               cairo_line_to (cr, _width, y + _track_height / 2);
+               cairo_line_to (cr, get_width(), y + _track_height / 2);
                cairo_stroke (cr);
-               
+
                StreamView* s = (*i)->view ();
 
                if (s) {
@@ -180,7 +201,7 @@ EditorSummary::render (cairo_t* cr)
                                                       y + _track_height / 2
                                                       ));
                }
-               
+
                y += _track_height;
        }
 
@@ -191,12 +212,12 @@ EditorSummary::render (cairo_t* cr)
 
        double const p = (_session->current_start_frame() - _start) * _x_scale;
        cairo_move_to (cr, p, 0);
-       cairo_line_to (cr, p, _height);
+       cairo_line_to (cr, p, get_height());
        cairo_stroke (cr);
 
        double const q = (_session->current_end_frame() - _start) * _x_scale;
        cairo_move_to (cr, q, 0);
-       cairo_line_to (cr, q, _height);
+       cairo_line_to (cr, q, get_height());
        cairo_stroke (cr);
 }
 
@@ -254,19 +275,22 @@ EditorSummary::centre_on_click (GdkEventButton* ev)
        get_editor (&xr, &yr);
 
        double const w = xr.second - xr.first;
+       double ex = ev->x - w / 2;
+       if (ex < 0) {
+               ex = 0;
+       } else if ((ex + w) > get_width()) {
+               ex = get_width() - w;
+       }
 
-       xr.first = ev->x - w / 2;
-       xr.second = ev->x + w / 2;
-
-       if (xr.first < 0) {
-               xr.first = 0;
-               xr.second = w;
-       } else if (xr.second > _width) {
-               xr.second = _width;
-               xr.first = _width - w;
+       double const h = yr.second - yr.first;
+       double ey = ev->y - h / 2;
+       if (ey < 0) {
+               ey = 0;
+       } else if ((ey + h) > get_height()) {
+               ey = get_height() - h;
        }
 
-       set_editor (xr, ev->y);
+       set_editor (ex, ey);
 }
 
 /** Handle a button press.
@@ -285,45 +309,25 @@ EditorSummary::on_button_press_event (GdkEventButton* ev)
                _start_editor_y = yr;
                _start_mouse_x = ev->x;
                _start_mouse_y = ev->y;
+               _start_position = get_position (ev->x, ev->y);
 
-               if (
-                       _start_editor_x.first <= _start_mouse_x && _start_mouse_x <= _start_editor_x.second &&
-                       _start_editor_y.first <= _start_mouse_y && _start_mouse_y <= _start_editor_y.second
+               if (_start_position != INSIDE && _start_position != BELOW_OR_ABOVE &&
+                   _start_position != TO_LEFT_OR_RIGHT && _start_position != OTHERWISE_OUTSIDE
                        ) {
 
-                       _start_position = IN_VIEWBOX;
-
-               } else if (_start_editor_x.first <= _start_mouse_x && _start_mouse_x <= _start_editor_x.second) {
-
-                       _start_position = BELOW_OR_ABOVE_VIEWBOX;
-
-               } else {
-
-                       _start_position = TO_LEFT_OR_RIGHT_OF_VIEWBOX;
-               }
-
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       /* start a zoom drag */
 
-                       /* primary-modifier-click: start a zoom drag */
-
-                       double const hx = (xr.first + xr.second) * 0.5;
-                       _zoom_left = ev->x < hx;
+                       _zoom_position = get_position (ev->x, ev->y);
                        _zoom_dragging = true;
                        _editor->_dragging_playhead = true;
+                       _old_follow_playhead = _editor->follow_playhead ();
+                       _editor->set_follow_playhead (false);
 
-
-                       /* In theory, we could support vertical dragging, which logically
-                          might scale track heights in order to make the editor reflect
-                          the dragged viewbox.  However, having tried this:
-                          a) it's hard to do
-                          b) it's quite slow
-                          c) it doesn't seem particularly useful, especially with the
-                          limited height of the summary
-
-                          So at the moment we don't support that...
-                       */
-
-
+                       if (suspending_editor_updates ()) {
+                               get_editor (&_pending_editor_x, &_pending_editor_y);
+                               _pending_editor_changed = false;
+                       }
+                       
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
 
                        /* secondary-modifier-click: locate playhead */
@@ -337,47 +341,149 @@ EditorSummary::on_button_press_event (GdkEventButton* ev)
 
                } else {
 
-                       /* ordinary click: start a move drag */
+                       /* start a move drag */
+
+                       /* get the editor's state in case we are suspending updates */
+                       get_editor (&_pending_editor_x, &_pending_editor_y);
+                       _pending_editor_changed = false;
 
                        _move_dragging = true;
                        _moved = false;
                        _editor->_dragging_playhead = true;
+                       _old_follow_playhead = _editor->follow_playhead ();
+                       _editor->set_follow_playhead (false);
                }
        }
 
        return true;
 }
 
+/** @return true if we are currently suspending updates to the editor's viewport,
+ *  which we do if configured to do so, and if in a drag of some kind.
+ */
+bool
+EditorSummary::suspending_editor_updates () const
+{
+       return (!Config->get_update_editor_during_summary_drag () && (_zoom_dragging || _move_dragging));
+}
+
+/** Fill in x and y with the editor's current viewable area in summary coordinates */
 void
 EditorSummary::get_editor (pair<double, double>* x, pair<double, double>* y) const
 {
-       x->first = (_editor->leftmost_position () - _start) * _x_scale;
-       x->second = x->first + _editor->current_page_frames() * _x_scale;
+       assert (x);
+       assert (y);
 
-       /* set these here in case the loop below does not change them */
-       y->first = 0;
-       y->second = _height;
+       if (suspending_editor_updates ()) {
 
-       TrackViewList::const_iterator i = _editor->track_views.begin ();
-       double ty = 0;
-       double const top = _editor->vertical_adjustment.get_value ();
-       double const bottom = top + _editor->canvas_height() - _editor->get_canvas_timebars_vsize ();
-       int n = 0;
-       while (i != _editor->track_views.end()) {
+               /* We are dragging, and configured not to update the editor window during drags,
+                  so just return where the editor will be when the drag finishes.
+               */
+                  
+               *x = _pending_editor_x;
+               *y = _pending_editor_y;
 
-               double const h = (*i)->effective_height ();
-               if (ty <= top && top <= (ty + h)) {
-                       y->first = (n + (top - ty) / h) * _track_height;
-               }
+       } else {
 
-               if (ty <= bottom && bottom <= (ty + h)) {
-                       y->second = (n + (bottom - ty) / h) * _track_height;
-                       break;
-               }
+               /* Otherwise query the editor for its actual position */
 
-               ++i;
-               ++n;
-               ty += h;
+               x->first = (_editor->leftmost_position () - _start) * _x_scale;
+               x->second = x->first + _editor->current_page_frames() * _x_scale;
+               
+               y->first = editor_y_to_summary (_editor->vertical_adjustment.get_value ());
+               y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->canvas_height() - _editor->get_canvas_timebars_vsize());
+       }
+}
+
+/** Get an expression of the position of a point with respect to the view rectangle */
+EditorSummary::Position
+EditorSummary::get_position (double x, double y) const
+{
+       /* how close the mouse has to be to the edge of the view rectangle to be considered `on it',
+          in pixels */
+
+       int x_edge_size = (_view_rectangle_x.second - _view_rectangle_x.first) / 4;
+       x_edge_size = min (x_edge_size, 8);
+       x_edge_size = max (x_edge_size, 1);
+
+       int y_edge_size = (_view_rectangle_y.second - _view_rectangle_y.first) / 4;
+       y_edge_size = min (y_edge_size, 8);
+       y_edge_size = max (y_edge_size, 1);
+
+       bool const near_left = (std::abs (x - _view_rectangle_x.first) < x_edge_size);
+       bool const near_right = (std::abs (x - _view_rectangle_x.second) < x_edge_size);
+       bool const near_top = (std::abs (y - _view_rectangle_y.first) < y_edge_size);
+       bool const near_bottom = (std::abs (y - _view_rectangle_y.second) < y_edge_size);
+       bool const within_x = _view_rectangle_x.first < x && x < _view_rectangle_x.second;
+       bool const within_y = _view_rectangle_y.first < y && y < _view_rectangle_y.second;
+
+       if (near_left && near_top) {
+               return LEFT_TOP;
+       } else if (near_left && near_bottom) {
+               return LEFT_BOTTOM;
+       } else if (near_right && near_top) {
+               return RIGHT_TOP;
+       } else if (near_right && near_bottom) {
+               return RIGHT_BOTTOM;
+       } else if (near_left && within_y) {
+               return LEFT;
+       } else if (near_right && within_y) {
+               return RIGHT;
+       } else if (near_top && within_x) {
+               return TOP;
+       } else if (near_bottom && within_x) {
+               return BOTTOM;
+       } else if (within_x && within_y) {
+               return INSIDE;
+       } else if (within_x) {
+               return BELOW_OR_ABOVE;
+       } else if (within_y) {
+               return TO_LEFT_OR_RIGHT;
+       } else {
+               return OTHERWISE_OUTSIDE;
+       }
+}
+
+void
+EditorSummary::set_cursor (Position p)
+{
+       switch (p) {
+       case LEFT:
+               get_window()->set_cursor (*_editor->_cursors->resize_left);
+               break;
+       case LEFT_TOP:
+               get_window()->set_cursor (*_editor->_cursors->resize_top_left);
+               break;
+       case TOP:
+               get_window()->set_cursor (*_editor->_cursors->resize_top);
+               break;
+       case RIGHT_TOP:
+               get_window()->set_cursor (*_editor->_cursors->resize_top_right);
+               break;
+       case RIGHT:
+               get_window()->set_cursor (*_editor->_cursors->resize_right);
+               break;
+       case RIGHT_BOTTOM:
+               get_window()->set_cursor (*_editor->_cursors->resize_bottom_right);
+               break;
+       case BOTTOM:
+               get_window()->set_cursor (*_editor->_cursors->resize_bottom);
+               break;
+       case LEFT_BOTTOM:
+               get_window()->set_cursor (*_editor->_cursors->resize_bottom_left);
+               break;
+       case INSIDE:
+               get_window()->set_cursor (*_editor->_cursors->move);
+               break;
+       case TO_LEFT_OR_RIGHT:
+               get_window()->set_cursor (*_editor->_cursors->expand_left_right);
+               break;
+       case BELOW_OR_ABOVE:
+               get_window()->set_cursor (*_editor->_cursors->expand_up_down);
+               break;
+       default:
+               get_window()->set_cursor ();
+               break;
        }
 }
 
@@ -386,45 +492,59 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
 {
        pair<double, double> xr = _start_editor_x;
        pair<double, double> yr = _start_editor_y;
-       double y = (_start_editor_y.first + _start_editor_y.second) / 2;
+       double x = _start_editor_x.first;
+       double y = _start_editor_y.first;
 
        if (_move_dragging) {
 
                _moved = true;
 
                /* don't alter x if we clicked outside and above or below the viewbox */
-               if (_start_position == IN_VIEWBOX || _start_position == TO_LEFT_OR_RIGHT_OF_VIEWBOX) {
-                       xr.first += ev->x - _start_mouse_x;
-                       xr.second += ev->x - _start_mouse_x;
+               if (_start_position == INSIDE || _start_position == TO_LEFT_OR_RIGHT || _start_position == OTHERWISE_OUTSIDE) {
+                       x += ev->x - _start_mouse_x;
                }
 
                /* don't alter y if we clicked outside and to the left or right of the viewbox */
-               if (_start_position == IN_VIEWBOX || _start_position == BELOW_OR_ABOVE_VIEWBOX) {
+               if (_start_position == INSIDE || _start_position == BELOW_OR_ABOVE) {
                        y += ev->y - _start_mouse_y;
                }
 
-               if (xr.first < 0) {
-                       xr.second -= xr.first;
-                       xr.first = 0;
+               if (x < 0) {
+                       x = 0;
                }
 
                if (y < 0) {
                        y = 0;
                }
 
-               set_editor (xr, y);
+               set_editor (x, y);
+               set_cursor (_start_position);
 
        } else if (_zoom_dragging) {
 
                double const dx = ev->x - _start_mouse_x;
+               double const dy = ev->y - _start_mouse_y;
 
-               if (_zoom_left) {
+               if (_zoom_position == LEFT || _zoom_position == LEFT_TOP || _zoom_position == LEFT_BOTTOM) {
                        xr.first += dx;
-               } else {
+               } else if (_zoom_position == RIGHT || _zoom_position == RIGHT_TOP || _zoom_position == RIGHT_BOTTOM) {
                        xr.second += dx;
                }
 
-               set_editor (xr, y);
+               if (_zoom_position == TOP || _zoom_position == LEFT_TOP || _zoom_position == RIGHT_TOP) {
+                       yr.first += dy;
+               } else if (_zoom_position == BOTTOM || _zoom_position == LEFT_BOTTOM || _zoom_position == RIGHT_BOTTOM) {
+                       yr.second += dy;
+               }
+
+               set_overlays_dirty ();
+               set_cursor (_zoom_position);
+               set_editor (xr, yr);
+
+       } else {
+
+               set_cursor (get_position (ev->x, ev->y));
+
        }
 
        return true;
@@ -433,9 +553,17 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
 bool
 EditorSummary::on_button_release_event (GdkEventButton*)
 {
+       bool const was_suspended = suspending_editor_updates ();
+       
        _move_dragging = false;
        _zoom_dragging = false;
        _editor->_dragging_playhead = false;
+       _editor->set_follow_playhead (_old_follow_playhead, false);
+
+       if (was_suspended && _pending_editor_changed) {
+               set_editor (_pending_editor_x, _pending_editor_y);
+       }
+               
        return true;
 }
 
@@ -447,7 +575,8 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev)
        pair<double, double> xr;
        pair<double, double> yr;
        get_editor (&xr, &yr);
-       double y = (yr.first + yr.second) / 2;
+       double x = xr.first;
+       double y = yr.first;
 
        double amount = 8;
 
@@ -457,16 +586,24 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev)
                amount = 1;
        }
 
-       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
 
-               /* primary-wheel == left-right scrolling */
+               /* secondary-wheel == left-right scrolling */
 
                if (ev->direction == GDK_SCROLL_UP) {
-                       xr.first += amount;
-                       xr.second += amount;
+                       x -= amount;
                } else if (ev->direction == GDK_SCROLL_DOWN) {
-                       xr.first -= amount;
-                       xr.second -= amount;
+                       x += amount;
+               }
+
+       } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+
+               /* primary-wheel == zoom */
+               
+               if (ev->direction == GDK_SCROLL_UP) {
+                       _editor->temporal_zoom_step (false);
+               } else {
+                       _editor->temporal_zoom_step (true);
                }
 
        } else {
@@ -476,24 +613,23 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev)
                } else if (ev->direction == GDK_SCROLL_UP) {
                        y -= amount;
                } else if (ev->direction == GDK_SCROLL_LEFT) {
-                       xr.first -= amount;
-                       xr.second -= amount;
+                       x -= amount;
                } else if (ev->direction == GDK_SCROLL_RIGHT) {
-                       xr.first += amount;
-                       xr.second += amount;
+                       x += amount;
                }
        }
 
-       set_editor (xr, y);
+       set_editor (x, y);
        return true;
 }
 
-/** Set the editor to display a given x range and a y range centred on a given position.
- *  The editor's x zoom is adjusted if necessary, but the y zoom is not changed.
+/** Set the editor to display a x range with the left at a given position
+ *  and a y range with the top at a given position.
  *  x and y parameters are specified in summary coordinates.
+ *  Zoom is not changed in either direction.
  */
 void
-EditorSummary::set_editor (pair<double,double> const & x, double const y)
+EditorSummary::set_editor (double const x, double const y)
 {
        if (_editor->pending_visual_change.idle_handler_id >= 0) {
 
@@ -510,37 +646,218 @@ EditorSummary::set_editor (pair<double,double> const & x, double const y)
 
                return;
        }
-       
-       double const ey = summary_y_to_editor (y);
-       double const eh = _editor->canvas_height() - _editor->get_canvas_timebars_vsize ();
-       double y1 = ey - eh / 2;
 
+       set_editor_x (x);
+       set_editor_y (y);
+}
+
+/** Set the editor to display a given x range and a y range with the top at a given position.
+ *  The editor's x zoom is adjusted if necessary, but the y zoom is not changed.
+ *  x and y parameters are specified in summary coordinates.
+ */
+void
+EditorSummary::set_editor (pair<double,double> const x, double const y)
+{
+       if (_editor->pending_visual_change.idle_handler_id >= 0) {
+               /* see comment in other set_editor () */
+               return;
+       }
+
+       set_editor_x (x);
+       set_editor_y (y);
+}
+
+/** Set the editor to display given x and y ranges.  x zoom and track heights are
+ *  adjusted if necessary.
+ *  x and y parameters are specified in summary coordinates.
+ */
+void
+EditorSummary::set_editor (pair<double,double> const x, pair<double, double> const y)
+{
+       if (_editor->pending_visual_change.idle_handler_id >= 0) {
+               /* see comment in other set_editor () */
+               return;
+       }
+
+       set_editor_x (x);
+       set_editor_y (y);
+}
+
+/** Set the left of the x range visible in the editor.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param x new x left position in summary coordinates.
+ */
+void
+EditorSummary::set_editor_x (double x)
+{
+       if (x < 0) {
+               x = 0;
+       }
+
+       if (suspending_editor_updates ()) {
+               double const w = _pending_editor_x.second - _pending_editor_x.first;
+               _pending_editor_x.first = x;
+               _pending_editor_x.second = x + w;
+               _pending_editor_changed = true;
+               set_dirty ();
+       } else {
+               _editor->reset_x_origin (x / _x_scale + _start);
+       }
+}
+
+/** Set the x range visible in the editor.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param x new x range in summary coordinates.
+ */
+void
+EditorSummary::set_editor_x (pair<double, double> x)
+{
+       if (x.first < 0) {
+               x.first = 0;
+       }
+
+       if (x.second < 0) {
+               x.second = x.first + 1;
+       }
+
+       if (suspending_editor_updates ()) {
+               _pending_editor_x = x;
+               _pending_editor_changed = true;
+               set_dirty ();
+       } else {
+               _editor->reset_x_origin (x.first / _x_scale + _start);
+               
+               double const nx = (
+                       ((x.second - x.first) / _x_scale) /
+                       _editor->frame_to_unit (_editor->current_page_frames())
+                       );
+               
+               if (nx != _editor->get_current_zoom ()) {
+                       _editor->reset_zoom (nx);
+               }
+       }
+}
+
+/** Set the top of the y range visible in the editor.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param y new editor top in summary coodinates.
+ */
+void
+EditorSummary::set_editor_y (double const y)
+{
+       double y1 = summary_y_to_editor (y);
+       double const eh = _editor->canvas_height() - _editor->get_canvas_timebars_vsize ();
        double y2 = y1 + eh;
+
        double const full_editor_height = _editor->full_canvas_height - _editor->get_canvas_timebars_vsize();
 
        if (y2 > full_editor_height) {
                y1 -= y2 - full_editor_height;
        }
-       
+
        if (y1 < 0) {
                y1 = 0;
        }
 
-       _editor->reset_x_origin (x.first / _x_scale + _start);
-       _editor->reset_y_origin (y1);
-       
-       double const nx = (
-               ((x.second - x.first) / _x_scale) /
-               _editor->frame_to_unit (_editor->current_page_frames())
-               );
+       if (suspending_editor_updates ()) {
+               double const h = _pending_editor_y.second - _pending_editor_y.first;
+               _pending_editor_y.first = y;
+               _pending_editor_y.second = y + h;
+               _pending_editor_changed = true;
+               set_dirty ();
+       } else {
+               _editor->reset_y_origin (y1);
+       }
+}
+
+/** Set the y range visible in the editor.  This is achieved by scaling track heights,
+ *  if necessary.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param y new editor range in summary coodinates.
+ */
+void
+EditorSummary::set_editor_y (pair<double, double> const y)
+{
+       if (suspending_editor_updates ()) {
+               _pending_editor_y = y;
+               _pending_editor_changed = true;
+               set_dirty ();
+               return;
+       }
        
-       if (nx != _editor->get_current_zoom ()) {
-               _editor->reset_zoom (nx);
-       }       
+       /* Compute current height of tracks between y.first and y.second.  We add up
+          the total height into `total_height' and the height of complete tracks into
+          `scale height'.
+       */
+
+       /* Copy of target range for use below */
+       pair<double, double> yc = y;
+       /* Total height of all tracks */
+       double total_height = 0;
+       /* Height of any parts of tracks that aren't fully in the desired range */
+       double partial_height = 0;
+       /* Height of any tracks that are fully in the desired range */
+       double scale_height = 0;
+
+       _editor->_routes->suspend_redisplay ();
+
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
+               double const h = (*i)->effective_height ();
+               total_height += h;
+
+               if (yc.first > 0 && yc.first < _track_height) {
+                       partial_height += (_track_height - yc.first) * h / _track_height;
+               } else if (yc.first <= 0 && yc.second >= _track_height) {
+                       scale_height += h;
+               } else if (yc.second > 0 && yc.second < _track_height) {
+                       partial_height += yc.second * h / _track_height;
+                       break;
+               }
+
+               yc.first -= _track_height;
+               yc.second -= _track_height;
+       }
+
+       /* Height that we will use for scaling; use the whole editor height unless there are not
+          enough tracks to fill it.
+       */
+       double const ch = min (total_height, _editor->canvas_height() - _editor->get_canvas_timebars_vsize());
+
+       /* hence required scale factor of the complete tracks to fit the required y range;
+          the amount of space they should take up divided by the amount they currently take up.
+       */
+       double const scale = (ch - partial_height) / scale_height;
+
+       yc = y;
+
+       /* Scale complete tracks within the range to make it fit */
+
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
+               if (yc.first <= 0 && yc.second >= _track_height) {
+                       (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)));
+               }
+
+               yc.first -= _track_height;
+               yc.second -= _track_height;
+       }
+
+       _editor->_routes->resume_redisplay ();
+
+        set_editor_y (y.first);
 }
 
 void
-EditorSummary::playhead_position_changed (nframes64_t p)
+EditorSummary::playhead_position_changed (framepos_t p)
 {
        if (_session && int (p * _x_scale) != int (_last_playhead)) {
                set_overlays_dirty ();
@@ -551,8 +868,12 @@ double
 EditorSummary::summary_y_to_editor (double y) const
 {
        double ey = 0;
-       TrackViewList::const_iterator i = _editor->track_views.begin ();
-       while (i != _editor->track_views.end()) {
+       for (TrackViewList::const_iterator i = _editor->track_views.begin (); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
                double const h = (*i)->effective_height ();
                if (y < _track_height) {
                        /* in this track */
@@ -561,8 +882,49 @@ EditorSummary::summary_y_to_editor (double y) const
 
                ey += h;
                y -= _track_height;
-               ++i;
        }
 
        return ey;
 }
+
+double
+EditorSummary::editor_y_to_summary (double y) const
+{
+       double sy = 0;
+       for (TrackViewList::const_iterator i = _editor->track_views.begin (); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
+               double const h = (*i)->effective_height ();
+               if (y < h) {
+                       /* in this track */
+                       return sy + y * _track_height / h;
+               }
+
+               sy += _track_height;
+               y -= h;
+       }
+
+       return sy;
+}
+
+void
+EditorSummary::routes_added (list<RouteTimeAxisView*> const & r)
+{
+       /* Connect to gui_changed() on the routes so that we know when their colour has changed */
+       for (list<RouteTimeAxisView*>::const_iterator i = r.begin(); i != r.end(); ++i) {
+               (*i)->route()->gui_changed.connect (*this, invalidator (*this), ui_bind (&EditorSummary::route_gui_changed, this, _1), gui_context ());
+       }
+
+       set_dirty ();
+}
+
+void
+EditorSummary::route_gui_changed (string c)
+{
+       if (c == "color") {
+               set_dirty ();
+       }
+}