Remove use of invalidated iterator (#4826).
[ardour.git] / gtk2_ardour / time_axis_view.cc
index 20227839287c6a65629b37cbacff34cac8ae20e3..104209d88498ac886c248b7ba78de637d4348562 100644 (file)
@@ -40,6 +40,7 @@
 #include "ardour/location.h"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "gui_thread.h"
 #include "public_editor.h"
 #include "time_axis_view.h"
@@ -66,25 +67,29 @@ using namespace ArdourCanvas;
 using Gtkmm2ext::Keyboard;
 
 const double trim_handle_size = 6.0; /* pixels */
-uint32_t TimeAxisView::extra_height;
-uint32_t TimeAxisView::smaller_height;
+uint32_t TimeAxisView::button_height = 0;
+uint32_t TimeAxisView::extra_height = 0;
 int const TimeAxisView::_max_order = 512;
 PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
 
 TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
-       : AxisView (sess),
-         controls_table (2, 8),
-         _y_position (0),
-         _editor (ed),
-         _order (0)
+       : AxisView (sess)
+       , controls_table (2, 8)
+       , _size_menu (0)
+       , _y_position (0)
+       , _editor (ed)
+       , _order (0)
+       , _preresize_cursor (0)
+       , _have_preresize_cursor (false)
+       , _ghost_group (0)
 {
        if (extra_height == 0) {
                compute_heights ();
        }
-       
+
        _canvas_background = new Group (*ed.get_background_group (), 0.0, 0.0);
        _canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0);
-       _canvas_display->hide(); // reveal as needed 
+       _canvas_display->hide(); // reveal as needed
 
        selection_group = new Group (*_canvas_display);
        selection_group->set_data (X_("timeselection"), (void *) 1);
@@ -101,7 +106,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        height = 0;
        _effective_height = 0;
        parent = rent;
-       _has_state = false;
        last_name_entry_key_press_event = 0;
        name_packing = NamePackingBits (0);
        _resize_drag_start = -1;
@@ -132,46 +136,39 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        name_hbox.show ();
 
        controls_table.set_size_request (200);
+       controls_table.set_row_spacings (2);
+       controls_table.set_col_spacings (2);
        controls_table.set_border_width (2);
-       controls_table.set_row_spacings (0);
-       controls_table.set_col_spacings (0);
        controls_table.set_homogeneous (true);
 
        controls_table.attach (name_hbox, 0, 5, 0, 1,  Gtk::FILL|Gtk::EXPAND,  Gtk::FILL|Gtk::EXPAND, 3, 0);
        controls_table.show_all ();
        controls_table.set_no_show_all ();
 
-       resizer.set_size_request (10, 6);
-       resizer.set_name ("ResizeHandle");
-       resizer.signal_expose_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_expose));
-       resizer.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_press));
-       resizer.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_release));
-       resizer.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_motion));
-
-       resizer.set_events (Gdk::BUTTON_PRESS_MASK|
-                       Gdk::BUTTON_RELEASE_MASK|
-                       Gdk::POINTER_MOTION_MASK|
-                       Gdk::SCROLL_MASK);
-
-       resizer_box.pack_start (resizer, false, false);
-       resizer.show ();
-       resizer_box.show();
-
        HSeparator* separator = manage (new HSeparator());
 
        controls_vbox.pack_start (controls_table, false, false);
-       controls_vbox.pack_end (resizer_box, false, false);
        controls_vbox.show ();
 
        //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
        controls_ebox.add (controls_vbox);
-       controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK);
+       controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK|
+                                 Gdk::BUTTON_RELEASE_MASK|
+                                 Gdk::POINTER_MOTION_MASK|
+                                 Gdk::ENTER_NOTIFY_MASK|
+                                 Gdk::LEAVE_NOTIFY_MASK|
+                                 Gdk::SCROLL_MASK);
        controls_ebox.set_flags (CAN_FOCUS);
 
-       controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
+       /* note that this handler connects *before* the default handler */
        controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
+       controls_ebox.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_press));
+       controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
+       controls_ebox.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_motion));
+       controls_ebox.signal_leave_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_leave));
+       controls_ebox.show ();
 
-       controls_hbox.pack_start (controls_ebox, false, false);
+       controls_hbox.pack_start (controls_ebox, true, true);
        controls_hbox.show ();
 
        time_axis_vbox.pack_start (controls_hbox, true, true);
@@ -215,6 +212,40 @@ TimeAxisView::~TimeAxisView()
 
        delete display_menu;
        display_menu = 0;
+
+       delete _size_menu;
+}
+
+void
+TimeAxisView::hide ()
+{
+       if (_hidden) {
+               return;
+       }
+
+       _canvas_display->hide ();
+       _canvas_background->hide ();
+
+       if (control_parent) {
+               control_parent->remove (time_axis_vbox);
+               control_parent = 0;
+       }
+
+       _y_position = -1;
+       _hidden = true;
+
+       /* now hide children */
+
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               (*i)->hide ();
+       }
+
+       /* if its hidden, it cannot be selected */
+       _editor.get_selection().remove (this);
+       /* and neither can its regions */
+       _editor.get_selection().remove_regions (this);
+
+       Hiding ();
 }
 
 /** Display this TimeAxisView as the nth component of the parent box, at y.
@@ -250,23 +281,22 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
        _canvas_background->raise_to_top ();
        _canvas_display->raise_to_top ();
 
-       if (_marked_for_display) {
-               time_axis_vbox.show ();
-               controls_ebox.show ();
-               _canvas_background->show ();
-       }
+       _canvas_background->show ();
+       _canvas_display->show ();
 
        _hidden = false;
 
        _effective_height = current_height ();
 
-       /* now show children */
+       /* now show relevant children */
 
        for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               if (canvas_item_visible ((*i)->_canvas_display)) {
+               if ((*i)->marked_for_display()) {
                        ++nth;
                        _effective_height += (*i)->show_at (y + _effective_height, nth, parent);
-               } 
+               } else {
+                       (*i)->hide ();
+               }
        }
 
        return _effective_height;
@@ -275,7 +305,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
 void
 TimeAxisView::clip_to_viewport ()
 {
-       if (_marked_for_display) {
+       if (marked_for_display()) {
                if (_y_position + _effective_height < _editor.get_trackview_group_vertical_offset () || _y_position > _editor.get_trackview_group_vertical_offset () + _canvas_display->get_canvas()->get_height()) {
                        _canvas_background->hide ();
                        _canvas_display->hide ();
@@ -290,14 +320,10 @@ TimeAxisView::clip_to_viewport ()
 bool
 TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 {
-       if (Keyboard::some_magic_widget_has_focus()) {
-               return false;
-       }
-
        switch (ev->direction) {
        case GDK_SCROLL_UP:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                       step_height (true);
+                       step_height (false);
                        return true;
                } else if (Keyboard::no_modifiers_active (ev->state)) {
                        _editor.scroll_tracks_up_line();
@@ -307,7 +333,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_DOWN:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                       step_height (false);
+                       step_height (true);
                        return true;
                } else if (Keyboard::no_modifiers_active (ev->state)) {
                        _editor.scroll_tracks_down_line();
@@ -324,89 +350,148 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 }
 
 bool
-TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
+TimeAxisView::controls_ebox_button_press (GdkEventButton* event)
 {
-       switch (ev->button) {
-       case 1:
-               selection_click (ev);
-               break;
-
-       case 3:
-               popup_display_menu (ev->time);
-               break;
+       if (maybe_set_cursor (event->y) > 0) {
+               _resize_drag_start = event->y_root;
        }
 
        return true;
 }
 
 void
-TimeAxisView::selection_click (GdkEventButton* ev)
+TimeAxisView::idle_resize (uint32_t h)
 {
-       Selection::Operation op = ArdourKeyboard::selection_type (ev->state);
-       _editor.set_selected_track (*this, op, false);
+       set_height (h);
 }
 
-void
-TimeAxisView::hide ()
+
+bool
+TimeAxisView::controls_ebox_motion (GdkEventMotion* ev)
 {
-       if (_hidden) {
-               return;
+       if (_resize_drag_start >= 0) {
+               /* (ab)use the DragManager to do autoscrolling; adjust the event coordinates
+                  into the world coordinate space that DragManager::motion_handler is expecting,
+                  and then fake a DragManager motion event so that when maybe_autoscroll
+                  asks DragManager for the current pointer position it will get the correct
+                  answers.
+               */
+               int tx, ty;
+               controls_ebox.translate_coordinates (*control_parent, ev->x, ev->y, tx, ty);
+               ev->y = ty - _editor.get_trackview_group_vertical_offset();
+               _editor.drags()->motion_handler ((GdkEvent *) ev, false);
+               _editor.maybe_autoscroll (false, true, false, ev->y_root < _resize_drag_start);
+
+               /* now do the actual TAV resize */
+                int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
+                _editor.add_to_idle_resize (this, delta);
+                _resize_drag_start = ev->y_root;
+        } else {
+               /* not dragging but ... */
+               maybe_set_cursor (ev->y);
        }
 
-       _canvas_display->hide ();
-       _canvas_background->hide ();
+       return true;
+}
 
-       if (control_parent) {
-               control_parent->remove (time_axis_vbox);
-               control_parent = 0;
+bool
+TimeAxisView::controls_ebox_leave (GdkEventCrossing*)
+{
+       if (_have_preresize_cursor) {
+               gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor);
+               _have_preresize_cursor = false;
        }
+       return true;
+}
 
-       _y_position = -1;
-       _hidden = true;
+bool
+TimeAxisView::maybe_set_cursor (int y)
+{
+       /* XXX no Gtkmm Gdk::Window::get_cursor() */
+       Glib::RefPtr<Gdk::Window> win = controls_ebox.get_window();
 
-       /* now hide children */
+       if (y > (gint) floor (controls_ebox.get_height() * 0.75)) {
 
-       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               (*i)->hide ();
+               /* y-coordinate in lower 25% */
+
+               if (!_have_preresize_cursor) {
+                       _preresize_cursor = gdk_window_get_cursor (win->gobj());
+                       _have_preresize_cursor = true;
+                       win->set_cursor (Gdk::Cursor(Gdk::SB_V_DOUBLE_ARROW));
+               }
+
+               return 1;
+
+       } else if (_have_preresize_cursor) {
+               gdk_window_set_cursor (win->gobj(), _preresize_cursor);
+               _have_preresize_cursor = false;
+
+               return -1;
        }
 
-       /* if its hidden, it cannot be selected */
+       return 0;
+}
 
-       _editor.get_selection().remove (this);
+bool
+TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
+{
+       if (_resize_drag_start >= 0) {
+               if (_have_preresize_cursor) {
+                       gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor);
+                       _preresize_cursor = 0;
+                       _have_preresize_cursor = false;
+               }
+               _editor.stop_canvas_autoscroll ();
+               _resize_drag_start = -1;
+       }
 
-       Hiding ();
+       switch (ev->button) {
+       case 1:
+               selection_click (ev);
+               break;
+
+       case 3:
+               popup_display_menu (ev->time);
+               break;
+       }
+
+       return true;
 }
 
 void
-TimeAxisView::step_height (bool bigger)
+TimeAxisView::selection_click (GdkEventButton* ev)
+{
+       Selection::Operation op = ArdourKeyboard::selection_type (ev->state);
+       _editor.set_selected_track (*this, op, false);
+}
+
+
+/** Steps through the defined heights for this TrackView.
+ *  @param coarser true if stepping should decrease in size, otherwise false.
+ */
+void
+TimeAxisView::step_height (bool coarser)
 {
        static const uint32_t step = 25;
 
-       if (bigger) {
-               if (height == preset_height(HeightSmall)) {
-                       set_height (preset_height(HeightSmaller));
-               } 
-               else if (height == preset_height(HeightSmaller)) {
-                       set_height (preset_height(HeightNormal));
-               } 
-               else {
-                       set_height (height + step);
-               }
+       if (coarser) {
 
-       } else {
-               if ( height == preset_height(HeightSmall)){
+               if (height <= preset_height (HeightSmall)) {
                        return;
+               } else if (height <= preset_height (HeightNormal) && height > preset_height (HeightSmall)) {
+                       set_height_enum (HeightSmall);
+               } else {
+                       set_height (height - step);
                }
-               
-               if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) {
-                       set_height (preset_height(HeightSmall));
-               }
-               else if ( height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)){
-                       set_height (preset_height(HeightSmaller));
+
+       } else {
+
+               if (height <= preset_height(HeightSmall)) {
+                       set_height_enum (HeightNormal);
+               } else {
+                       set_height (height + step);
                }
-               else {
-                       set_height (height - step);
-               } 
+
        }
 }
 
@@ -421,9 +506,13 @@ TimeAxisView::set_heights (uint32_t h)
 }
 
 void
-TimeAxisView::set_height (Height h)
+TimeAxisView::set_height_enum (Height h, bool apply_to_selection)
 {
-       set_height (preset_height (h));
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_time_axis (boost::bind (&TimeAxisView::set_height_enum, _1, h, false));
+       } else {
+               set_height (preset_height (h));
+       }
 }
 
 void
@@ -432,10 +521,14 @@ TimeAxisView::set_height (uint32_t h)
        if (h < preset_height (HeightSmall)) {
                h = preset_height (HeightSmall);
        }
-       
+
        time_axis_vbox.property_height_request () = h;
        height = h;
 
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       set_gui_property ("height", buf);
+
        for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                (*i)->set_height ();
        }
@@ -468,13 +561,25 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
                name_entry_changed ();
                TrackViewList const & allviews = _editor.get_track_views ();
                TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this);
+
                if (ev->keyval == GDK_Tab) {
                        if (i != allviews.end()) {
                                do {
                                        if (++i == allviews.end()) {
                                                return true;
                                        }
-                               } while((*i)->hidden());
+
+                                       RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
+
+                                       if (rtav && rtav->route()->record_enabled()) {
+                                               continue;
+                                       }
+
+                                       if (!(*i)->hidden()) {
+                                               break;
+                                       }
+
+                               } while (true);
                        }
                } else {
                        if (i != allviews.begin()) {
@@ -482,22 +587,30 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
                                        if (i == allviews.begin()) {
                                                return true;
                                        }
+
                                        --i;
-                               } while ((*i)->hidden());
+
+                                       RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
+
+                                       if (rtav && rtav->route()->record_enabled()) {
+                                               continue;
+                                       }
+
+                                       if (!(*i)->hidden()) {
+                                               break;
+                                       }
+
+                               } while (true);
                        }
                }
-               
-               
-               /* resize to show editable name display */
-               
-               if ((*i)->current_height() <= preset_height (HeightSmaller)) {
-                       (*i)->set_height (HeightSmaller);
+
+               if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
+                       (*i)->name_entry.grab_focus();
+                       _editor.ensure_time_axis_view_is_visible (**i);
                }
-               
-               (*i)->name_entry.grab_focus();
        }
        return true;
-       
+
        case GDK_Up:
        case GDK_Down:
                name_entry_changed ();
@@ -535,7 +648,7 @@ bool
 TimeAxisView::name_entry_focus_in (GdkEventFocus*)
 {
        name_entry.select_region (0, -1);
-       name_entry.set_name ("EditorActiveTrackNameDisplay");
+       name_entry.set_state (STATE_SELECTED);
        return false;
 }
 
@@ -546,8 +659,8 @@ TimeAxisView::name_entry_focus_out (GdkEventFocus*)
 
        last_name_entry_key_press_event = 0;
        name_entry_key_timeout.disconnect ();
-       name_entry.set_name ("EditorTrackNameDisplay");
        name_entry.select_region (0,0);
+       name_entry.set_state (STATE_NORMAL);
 
        /* do the real stuff */
 
@@ -606,11 +719,9 @@ TimeAxisView::conditionally_add_to_selection ()
 void
 TimeAxisView::popup_display_menu (guint32 when)
 {
-       if (display_menu == 0) {
-               build_display_menu ();
-       }
-
        conditionally_add_to_selection ();
+
+       build_display_menu ();
        display_menu->popup (1, when);
 }
 
@@ -642,8 +753,6 @@ TimeAxisView::set_selected (bool yn)
                        (*i)->set_selected (false);
                }
        }
-
-       resizer.queue_draw ();
 }
 
 void
@@ -671,7 +780,7 @@ TimeAxisView::set_samples_per_unit (double spu)
 }
 
 void
-TimeAxisView::show_timestretch (nframes_t start, nframes_t end)
+TimeAxisView::show_timestretch (framepos_t start, framepos_t end)
 {
        for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                (*i)->show_timestretch (start, end);
@@ -713,7 +822,8 @@ TimeAxisView::show_selection (TimeSelection& ts)
        selection_group->raise_to_top();
 
        for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
-               nframes_t start, end, cnt;
+               framepos_t start, end;
+               framecnt_t cnt;
 
                start = (*i).start;
                end = (*i).end;
@@ -848,7 +958,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
                rect->start_trim->property_outline_what() = 0x0;
                rect->start_trim->property_x1() = 0.0;
                rect->start_trim->property_x2() = 0.0;
-               
+
                rect->end_trim = new SimpleRect (*selection_group);
                rect->end_trim->property_outline_what() = 0x0;
                rect->end_trim->property_x1() = 0.0;
@@ -915,24 +1025,24 @@ TimeAxisView::add_ghost (RegionView* rv)
 {
        GhostRegion* gr = rv->add_ghost (*this);
 
-       if(gr) {
+       if (gr) {
                ghosts.push_back(gr);
        }
 }
 
 void
-TimeAxisView::remove_ghost (RegionView* rv) 
+TimeAxisView::remove_ghost (RegionView* rv)
 {
        rv->remove_ghost_in (*this);
 }
 
 void
-TimeAxisView::erase_ghost (GhostRegion* gr) 
+TimeAxisView::erase_ghost (GhostRegion* gr)
 {
        if (in_destructor) {
                return;
        }
-       
+
        for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                if ((*i) == gr) {
                        ghosts.erase (i);
@@ -961,88 +1071,8 @@ TimeAxisView::set_parent (TimeAxisView& p)
        parent = &p;
 }
 
-bool
-TimeAxisView::has_state () const
-{
-       return _has_state;
-}
-
-TimeAxisView*
-TimeAxisView::get_parent_with_state ()
-{
-       if (parent == 0) {
-               return 0;
-       }
-
-       if (parent->has_state()) {
-               return parent;
-       }
-
-       return parent->get_parent_with_state ();
-}
-
-
-XMLNode&
-TimeAxisView::get_state ()
-{
-       /* XXX: is this method used? */
-       
-       XMLNode* node = new XMLNode ("TAV-" + name());
-       char buf[32];
-
-       snprintf (buf, sizeof(buf), "%u", height);
-       node->add_property ("height", buf);
-       node->add_property ("marked-for-display", (_marked_for_display ? "1" : "0"));
-       return *node;
-}
-
-int
-TimeAxisView::set_state (const XMLNode& node, int /*version*/)
-{
-       const XMLProperty *prop;
-
-       /* XXX: I think this might be vestigial */
-       if ((prop = node.property ("marked-for-display")) != 0) {
-               _marked_for_display = (prop->value() == "1");
-       }
-
-       if ((prop = node.property ("shown-editor")) != 0) {
-               _marked_for_display = string_is_affirmative (prop->value ());
-       }
-
-       if ((prop = node.property ("track-height")) != 0) {
-
-               if (prop->value() == "largest") {
-                       set_height (HeightLargest);
-               } else if (prop->value() == "large") {
-                       set_height (HeightLarge);
-               } else if (prop->value() == "larger") {
-                       set_height (HeightLarger);
-               } else if (prop->value() == "normal") {
-                       set_height (HeightNormal);
-               } else if (prop->value() == "smaller") {
-                       set_height (HeightSmaller);
-               } else if (prop->value() == "small") {
-                       set_height (HeightSmall);
-               } else {
-                       error << string_compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg;
-                       set_height (HeightNormal);
-               }
-
-       } else if ((prop = node.property ("height")) != 0) {
-
-               set_height (atoi (prop->value()));
-
-       } else {
-
-               set_height (HeightNormal);
-       }
-
-       return 0;
-}
-
 void
-TimeAxisView::reset_height()
+TimeAxisView::reset_height ()
 {
        set_height (height);
 
@@ -1059,9 +1089,9 @@ TimeAxisView::compute_heights ()
        Gtk::Table one_row_table (1, 8);
        Button* buttons[5];
        const int border_width = 2;
-       extra_height = (2 * border_width)
-               //+ 2   // 2 pixels for the hseparator between TimeAxisView control areas
-               + 6; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps)
+
+       const int separator_height = 2;
+       extra_height = (2 * border_width) + separator_height;
 
        window.add (one_row_table);
 
@@ -1086,8 +1116,7 @@ TimeAxisView::compute_heights ()
        Gtk::Requisition req(one_row_table.size_request ());
 
        // height required to show 1 row of buttons
-
-       smaller_height = req.height + extra_height;
+       button_height = req.height;
 }
 
 void
@@ -1133,7 +1162,7 @@ TimeAxisView::hide_name_entry ()
 void
 TimeAxisView::color_handler ()
 {
-       for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
+       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); i++) {
                (*i)->set_colors();
        }
 
@@ -1166,28 +1195,43 @@ TimeAxisView::color_handler ()
  * TimeAxisView is non-0 if this object covers y, or one of its children does.
  * If the covering object is a child axis, then the child is returned.
  * TimeAxisView is 0 otherwise.
- * Layer index is the layer number if the TimeAxisView is valid and is in stacked
- * region display mode, otherwise 0.
+ * Layer index is the layer number (possibly fractional) if the TimeAxisView is valid
+ * and is in stacked or expanded * region display mode, otherwise 0.
  */
-std::pair<TimeAxisView*, layer_t>
+std::pair<TimeAxisView*, double>
 TimeAxisView::covers_y_position (double y)
 {
        if (hidden()) {
-               return std::make_pair ( (TimeAxisView *) 0, 0);
+               return std::make_pair ((TimeAxisView *) 0, 0);
        }
 
        if (_y_position <= y && y < (_y_position + height)) {
 
                /* work out the layer index if appropriate */
-               layer_t l = 0;
-               if (layer_display () == Stacked && view ()) {
-                       /* compute layer */
-                       l = layer_t ((_y_position + height - y) / (view()->child_height ()));
-                       /* clamp to max layers to be on the safe side; sometimes the above calculation
-                         returns a too-high value */
-                       if (l >= view()->layers ()) {
-                               l = view()->layers() - 1;
+               double l = 0;
+               switch (layer_display ()) {
+               case Overlaid:
+                       break;
+               case Stacked:
+                       if (view ()) {
+                               /* compute layer */
+                               l = layer_t ((_y_position + height - y) / (view()->child_height ()));
+                               /* clamp to max layers to be on the safe side; sometimes the above calculation
+                                  returns a too-high value */
+                               if (l >= view()->layers ()) {
+                                       l = view()->layers() - 1;
+                               }
                        }
+                       break;
+               case Expanded:
+                       if (view ()) {
+                               int const n = floor ((_y_position + height - y) / (view()->child_height ()));
+                               l = n * 0.5 - 0.5;
+                               if (l >= (view()->layers() - 0.5)) {
+                                       l = view()->layers() - 0.5;
+                               }
+                       }
+                       break;
                }
 
                return std::make_pair (this, l);
@@ -1201,125 +1245,24 @@ TimeAxisView::covers_y_position (double y)
                }
        }
 
-       return std::make_pair ( (TimeAxisView *) 0, 0);
-}
-
-bool
-TimeAxisView::resizer_button_press (GdkEventButton* event)
-{
-       _resize_drag_start = event->y_root;
-       return true;
-}
-
-bool
-TimeAxisView::resizer_button_release (GdkEventButton*)
-{
-       _editor.stop_canvas_autoscroll ();
-       _resize_drag_start = -1;
-       return true;
-}
-
-void
-TimeAxisView::idle_resize (uint32_t h)
-{
-       set_height (h);
-}
-
-bool
-TimeAxisView::resizer_motion (GdkEventMotion* ev)
-{
-       if (_resize_drag_start >= 0) {
-               /* (ab)use the DragManager to do autoscrolling; adjust the event coordinates
-                  into the trackview space that DragManager::motion_handler is expecting,
-                  and then fake a DragManager motion event so that when maybe_autoscroll
-                  asks DragManager for the current pointer position it will get the correct
-                  answers.
-               */
-               int tx, ty;
-               resizer.translate_coordinates (*control_parent, ev->x, ev->y, tx, ty);
-               ev->y = ty + _editor.get_canvas_timebars_vsize ();
-               _editor.drags()->motion_handler ((GdkEvent *) ev, false);
-               _editor.maybe_autoscroll (false, true);
-
-               /* now do the actual TAV resize */
-                int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
-                _editor.add_to_idle_resize (this, delta);
-                _resize_drag_start = ev->y_root;
-        }
-
-       return true;
-}
-
-bool
-TimeAxisView::resizer_expose (GdkEventExpose* event)
-{
-       int w, h, x, y, d;
-       Glib::RefPtr<Gdk::Window> win (resizer.get_window());
-       Glib::RefPtr<Gdk::GC> dark (resizer.get_style()->get_fg_gc (STATE_NORMAL));
-       Glib::RefPtr<Gdk::GC> light (resizer.get_style()->get_bg_gc (STATE_NORMAL));
-
-       win->draw_rectangle (controls_ebox.get_style()->get_bg_gc(STATE_NORMAL),
-                       true,
-                       event->area.x,
-                       event->area.y,
-                       event->area.width,
-                       event->area.height);
-
-       win->get_geometry (x, y, w, h, d);
-
-       /* handle/line #1 */
-
-       win->draw_line (dark, 0, 0, w - 2, 0);
-       win->draw_point (dark, 0, 1);
-       win->draw_line (light, 1, 1, w - 1, 1);
-       win->draw_point (light, w - 1, 0);
-
-       /* handle/line #2 */
-
-       win->draw_line (dark, 0, 4, w - 2, 4);
-       win->draw_point (dark, 0, 5);
-       win->draw_line (light, 1, 5, w - 1, 5);
-       win->draw_point (light, w - 1, 4);
-
-       /* use vertical resize mouse cursor */
-       win->set_cursor(Gdk::Cursor(Gdk::SB_V_DOUBLE_ARROW));
-
-       return true;
+       return std::make_pair ((TimeAxisView *) 0, 0);
 }
 
-bool
-TimeAxisView::set_visibility (bool yn)
-{
-       if (yn != marked_for_display()) {
-               if (yn) {
-                       set_marked_for_display (true);
-                       canvas_display()->show();
-               } else {
-                       set_marked_for_display (false);
-                       hide ();
-               }
-               return true; // things changed
-       }
-       
-       return false;
-}
 
 uint32_t
 TimeAxisView::preset_height (Height h)
 {
        switch (h) {
        case HeightLargest:
-               return extra_height + 48 + 250;
+               return (button_height * 2) + extra_height + 250;
        case HeightLarger:
-               return extra_height + 48 + 150;
+               return (button_height * 2) + extra_height + 150;
        case HeightLarge:
-               return extra_height + 48 + 50;
+               return (button_height * 2) + extra_height + 50;
        case HeightNormal:
-               return extra_height + 48;
+               return (button_height * 2) + extra_height;
        case HeightSmall:
-               return 27;
-       case HeightSmaller:
-               return smaller_height;
+               return button_height + extra_height;
        }
 
        /* NOTREACHED */
@@ -1337,8 +1280,69 @@ TimeAxisView::get_child_list ()
                        c.push_back(*i);
                }
        }
-       
+
        return c;
 }
 
+void
+TimeAxisView::build_size_menu ()
+{
+       if (_size_menu && _size_menu->gobj ()) {
+               return;
+       }
+
+       delete _size_menu;
+
+       using namespace Menu_Helpers;
+
+       _size_menu = new Menu;
+       _size_menu->set_name ("ArdourContextMenu");
+       MenuList& items = _size_menu->items();
+
+       items.push_back (MenuElem (_("Largest"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLargest, true)));
+       items.push_back (MenuElem (_("Larger"),  sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLarger, true)));
+       items.push_back (MenuElem (_("Large"),   sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLarge, true)));
+       items.push_back (MenuElem (_("Normal"),  sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightNormal, true)));
+       items.push_back (MenuElem (_("Small"),   sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightSmall, true)));
+}
+
+void
+TimeAxisView::reset_visual_state ()
+{
+       /* this method is not required to trigger a global redraw */
 
+       string str = gui_property ("height");
+       
+       if (!str.empty()) {
+               set_height (atoi (str));
+       } else {
+               set_height (preset_height (HeightNormal));
+       }
+}
+
+TrackViewList
+TrackViewList::filter_to_unique_playlists ()
+{
+       std::set<boost::shared_ptr<ARDOUR::Playlist> > playlists;
+       TrackViewList ts;
+
+       for (iterator i = begin(); i != end(); ++i) {
+               RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
+               if (!rtav) {
+                       /* not a route: include it anyway */
+                       ts.push_back (*i);
+               } else {
+                       boost::shared_ptr<ARDOUR::Track> t = rtav->track();
+                       if (t) {
+                               if (playlists.insert (t->playlist()).second) {
+                                       /* playlist not seen yet */
+                                       ts.push_back (*i);
+                               }
+                       } else {
+                               /* not a track: include it anyway */
+                               ts.push_back (*i);
+                       }
+               }
+       }
+       return ts;
+}