X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=978ce6debba905a3eb99df60f7f7f7f4bebbcd9a;hb=a8e019c9e0a0fcbbe9aa75f25dba90ca1a5eda2b;hp=b0618fdb028f7ec91c126531a27d91779d1fe386;hpb=b65f8073ba306ac2d85133875746767e7c6b0eb6;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index b0618fdb02..978ce6debb 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,10 +28,10 @@
 #include <libgnomecanvasmm/item.h>
 
 #include "pbd/error.h"
+#include "pbd/convert.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 
 #include "ardour/session.h"
 #include "ardour/utils.h"
@@ -40,6 +40,7 @@
 #include "ardour/location.h"
 
 #include "ardour_ui.h"
+#include "gui_thread.h"
 #include "public_editor.h"
 #include "time_axis_view.h"
 #include "region_view.h"
@@ -57,36 +58,32 @@
 using namespace std;
 using namespace Gtk;
 using namespace Gdk;
-using namespace sigc; 
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
 
 const double trim_handle_size = 6.0; /* pixels */
-
-uint32_t TimeAxisView::hLargest = 0;
-uint32_t TimeAxisView::hLarge = 0;
-uint32_t TimeAxisView::hLarger = 0;
-uint32_t TimeAxisView::hNormal = 0;
-uint32_t TimeAxisView::hSmaller = 0;
-uint32_t TimeAxisView::hSmall = 0;
-bool TimeAxisView::need_size_info = true;
+uint32_t TimeAxisView::extra_height;
+uint32_t TimeAxisView::smaller_height;
 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), 
+TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
+	: AxisView (sess),
 	  controls_table (2, 8),
 	  _y_position (0),
 	  _editor (ed),
 	  _order (0)
 {
-	if (need_size_info) {
-		compute_controls_size_info ();
-		need_size_info = false;
+	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 
 
 	selection_group = new Group (*_canvas_display);
 	selection_group->hide();
@@ -97,7 +94,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 
 	control_parent = 0;
 	display_menu = 0;
-	size_menu = 0;
 	_hidden = false;
 	in_destructor = false;
 	height = 0;
@@ -115,12 +111,12 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 	*/
 
 	name_entry.set_name ("EditorTrackNameDisplay");
-	name_entry.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_release));
-	name_entry.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_press));
-	name_entry.signal_key_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_key_release));
-	name_entry.signal_activate().connect (mem_fun(*this, &TimeAxisView::name_entry_activated));
-	name_entry.signal_focus_in_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_in));
-	name_entry.signal_focus_out_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_out));
+	name_entry.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_release));
+	name_entry.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_press));
+	name_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release));
+	name_entry.signal_activate().connect (sigc::mem_fun(*this, &TimeAxisView::name_entry_activated));
+	name_entry.signal_focus_in_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_in));
+	name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out));
 	Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
 
 	name_label.set_name ("TrackLabel");
@@ -133,6 +129,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 
 	name_hbox.show ();
 
+	controls_table.set_size_request (200);
 	controls_table.set_border_width (2);
 	controls_table.set_row_spacings (0);
 	controls_table.set_col_spacings (0);
@@ -142,12 +139,13 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 	controls_table.show_all ();
 	controls_table.set_no_show_all ();
 
-	resizer.set_size_request (10, 10);
+	resizer.set_size_request (10, 6);
 	resizer.set_name ("ResizeHandle");
-	resizer.signal_expose_event().connect (mem_fun (*this, &TimeAxisView::resizer_expose));
-	resizer.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_press));
-	resizer.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_release));
-	resizer.signal_motion_notify_event().connect (mem_fun (*this, &TimeAxisView::resizer_motion));
+	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|
@@ -160,8 +158,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 	HSeparator* separator = manage (new HSeparator());
 
 	controls_vbox.pack_start (controls_table, false, false);
-	controls_vbox.pack_end (*separator, false, false);
-	controls_vbox.pack_end (resizer_box, false, true);
+	controls_vbox.pack_end (resizer_box, false, false);
 	controls_vbox.show ();
 
 	//controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
@@ -169,13 +166,19 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 	controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK);
 	controls_ebox.set_flags (CAN_FOCUS);
 
-	controls_ebox.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
-	controls_ebox.signal_scroll_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
+	controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
+	controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
 
-	controls_hbox.pack_start (controls_ebox,true,true);
+	controls_hbox.pack_start (controls_ebox, false, false);
 	controls_hbox.show ();
 
-	ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
+	time_axis_vbox.pack_start (controls_hbox, true, true);
+	time_axis_vbox.pack_end (*separator, false, false);
+	time_axis_vbox.show();
+
+	ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
+
+	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
 }
 
 TimeAxisView::~TimeAxisView()
@@ -227,11 +230,11 @@ guint32
 TimeAxisView::show_at (double y, int& nth, VBox *parent)
 {
 	if (control_parent) {
-		control_parent->reorder_child (controls_hbox, nth);
+		control_parent->reorder_child (time_axis_vbox, nth);
 	} else {
 		control_parent = parent;
-		parent->pack_start (controls_hbox, false, false);
-		parent->reorder_child (controls_hbox, nth);
+		parent->pack_start (time_axis_vbox, false, false);
+		parent->reorder_child (time_axis_vbox, nth);
 	}
 
 	_order = nth;
@@ -250,7 +253,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
 	_canvas_display->raise_to_top ();
 
 	if (_marked_for_display) {
-		controls_hbox.show ();
+		time_axis_vbox.show ();
 		controls_ebox.show ();
 		_canvas_background->show ();
 	}
@@ -265,7 +268,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
 		if (canvas_item_visible ((*i)->_canvas_display)) {
 			++nth;
 			_effective_height += (*i)->show_at (y + _effective_height, nth, parent);
-		}
+		} 
 	}
 
 	return _effective_height;
@@ -289,6 +292,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)) {
@@ -337,7 +344,7 @@ TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
 void
 TimeAxisView::selection_click (GdkEventButton* ev)
 {
-	Selection::Operation op = Keyboard::selection_type (ev->state);
+	Selection::Operation op = ArdourKeyboard::selection_type (ev->state);
 	_editor.set_selected_track (*this, op, false);
 }
 
@@ -352,7 +359,7 @@ TimeAxisView::hide ()
 	_canvas_background->hide ();
 
 	if (control_parent) {
-		control_parent->remove (controls_hbox);
+		control_parent->remove (time_axis_vbox);
 		control_parent = 0;
 	}
 
@@ -381,9 +388,9 @@ TimeAxisView::step_height (bool bigger)
 		set_height (height + step);
 	} else {
 		if (height > step) {
-			set_height (std::max (height - step, hSmall));
-		} else if (height != hSmall) {
-			set_height (hSmall);
+			set_height (std::max (height - step, preset_height (HeightSmall)));
+		} else if (height != preset_height (HeightSmall)) {
+			set_height (HeightSmall);
 		}
 	}
 }
@@ -398,10 +405,16 @@ TimeAxisView::set_heights (uint32_t h)
 	}
 }
 
+void
+TimeAxisView::set_height (Height h)
+{
+	set_height (preset_height (h));
+}
+
 void
 TimeAxisView::set_height(uint32_t h)
 {
-	controls_ebox.property_height_request () = h;
+	time_axis_vbox.property_height_request () = h;
 	height = h;
 
 	for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
@@ -419,8 +432,7 @@ TimeAxisView::set_height(uint32_t h)
 bool
 TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 {
-	PublicEditor::TrackViewList *allviews = 0;
-	PublicEditor::TrackViewList::iterator i;
+	TrackViewList::iterator i;
 
 	switch (ev->keyval) {
 	case GDK_Escape:
@@ -430,40 +442,45 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 		return true;
 
 	/* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
-	 * generates a different ev->keyval, rather than setting 
+	 * generates a different ev->keyval, rather than setting
 	 * ev->state.
 	 */
 	case GDK_ISO_Left_Tab:
 	case GDK_Tab:
+	{
 		name_entry_changed ();
-		allviews = _editor.get_valid_views (0);
-		if (allviews != 0) {
-			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());
-				}
-			} else {
-				if (i != allviews->begin()) {
-					do {
-						if (--i == allviews->begin()) { return true; }
-					} while ((*i)->hidden());
-				}
+		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());
 			}
-
-
-			/* resize to show editable name display */
-
-			if ((*i)->current_height() >= hSmall && (*i)->current_height() < hNormal) {
-				(*i)->set_height (hSmaller);
+		} else {
+			if (i != allviews.begin()) {
+				do {
+					if (i == allviews.begin()) {
+						return true;
+					}
+					--i;
+				} while ((*i)->hidden());
 			}
-
-			(*i)->name_entry.grab_focus();
 		}
-		return true;
-
+		
+		
+		/* resize to show editable name display */
+		
+		if ((*i)->current_height() <= preset_height (HeightSmaller)) {
+			(*i)->set_height (HeightSmaller);
+		}
+		
+		(*i)->name_entry.grab_focus();
+	}
+	return true;
+	
 	case GDK_Up:
 	case GDK_Down:
 		name_entry_changed ();
@@ -473,7 +490,7 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 		break;
 	}
 
-#ifdef TIMEOUT_NAME_EDIT	
+#ifdef TIMEOUT_NAME_EDIT
 	/* adapt the timeout to reflect the user's typing speed */
 
 	guint32 name_entry_timeout;
@@ -491,7 +508,7 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 	/* wait 1 seconds and if no more keys are pressed, act as if they pressed enter */
 
 	name_entry_key_timeout.disconnect();
-	name_entry_key_timeout = Glib::signal_timeout().connect (mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
+	name_entry_key_timeout = Glib::signal_timeout().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
 #endif
 
 	return false;
@@ -577,24 +594,7 @@ TimeAxisView::popup_display_menu (guint32 when)
 	}
 
 	conditionally_add_to_selection ();
-	display_menu->popup (1, when);	
-}
-
-gint
-TimeAxisView::size_click (GdkEventButton *ev)
-{
-	conditionally_add_to_selection ();
-	popup_size_menu (ev->time);
-	return TRUE;
-}
-
-void
-TimeAxisView::popup_size_menu (guint32 when)
-{
-	if (size_menu == 0) {
-		build_size_menu ();
-	}
-	size_menu->popup (1, when);
+	display_menu->popup (1, when);
 }
 
 void
@@ -608,17 +608,11 @@ TimeAxisView::set_selected (bool yn)
 
 	if (_selected) {
 		controls_ebox.set_name (controls_base_selected_name);
-		controls_hbox.set_name (controls_base_selected_name);
+		time_axis_vbox.set_name (controls_base_selected_name);
 		controls_vbox.set_name (controls_base_selected_name);
-		/* propagate any existing selection, if the mode is right */
-
-		if (_editor.current_mouse_mode() == Editing::MouseRange && !_editor.get_selection().time.empty()) {
-			show_selection (_editor.get_selection().time);
-		}
-
 	} else {
 		controls_ebox.set_name (controls_base_unselected_name);
-		controls_hbox.set_name (controls_base_unselected_name);
+		time_axis_vbox.set_name (controls_base_unselected_name);
 		controls_vbox.set_name (controls_base_unselected_name);
 		hide_selection ();
 
@@ -635,28 +629,13 @@ TimeAxisView::set_selected (bool yn)
 	resizer.queue_draw ();
 }
 
-void
-TimeAxisView::build_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"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLargest)));
-	items.push_back (MenuElem (_("Large"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarge)));
-	items.push_back (MenuElem (_("Larger"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarger)));
-	items.push_back (MenuElem (_("Normal"), bind (mem_fun (*this, &TimeAxisView::set_heights), hNormal)));
-	items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_heights),hSmaller)));
-	items.push_back (MenuElem (_("Small"), bind (mem_fun (*this, &TimeAxisView::set_heights), hSmall)));
-}
-
 void
 TimeAxisView::build_display_menu ()
 {
 	using namespace Menu_Helpers;
 
+	delete display_menu;
+
 	display_menu = new Menu;
 	display_menu->set_name ("ArdourContextMenu");
 
@@ -867,10 +846,10 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
 		free_selection_rects.push_front (rect);
 
-		rect->rect->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
-		rect->start_trim->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
-		rect->end_trim->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect));
-	} 
+		rect->rect->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
+		rect->start_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
+		rect->end_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect));
+	}
 
 	rect = free_selection_rects.front();
 	rect->id = id;
@@ -921,24 +900,23 @@ TimeAxisView::add_ghost (RegionView* rv)
 
 	if(gr) {
 		ghosts.push_back(gr);
-		gr->GoingAway.connect (mem_fun(*this, &TimeAxisView::erase_ghost));
 	}
 }
 
 void
-TimeAxisView::remove_ghost (RegionView* rv) {
+TimeAxisView::remove_ghost (RegionView* rv) 
+{
 	rv->remove_ghost_in (*this);
 }
 
 void
-TimeAxisView::erase_ghost (GhostRegion* gr) {
-	if(in_destructor) {
+TimeAxisView::erase_ghost (GhostRegion* gr) 
+{
+	if (in_destructor) {
 		return;
 	}
-
-	list<GhostRegion*>::iterator i;
-
-	for (i = ghosts.begin(); i != ghosts.end(); ++i) {
+	
+	for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
 		if ((*i) == gr) {
 			ghosts.erase (i);
 			break;
@@ -954,11 +932,11 @@ TimeAxisView::touched (double top, double bot)
 	*/
 
 	double mybot = _y_position + current_height();
-	
-	return ((_y_position <= bot && _y_position >= top) || 
-		((mybot <= bot) && (top < mybot)) || 
+
+	return ((_y_position <= bot && _y_position >= top) ||
+		((mybot <= bot) && (top < mybot)) ||
 		(mybot >= bot && _y_position < top));
-}		
+}
 
 void
 TimeAxisView::set_parent (TimeAxisView& p)
@@ -981,7 +959,7 @@ TimeAxisView::get_parent_with_state ()
 
 	if (parent->has_state()) {
 		return parent;
-	} 
+	}
 
 	return parent->get_parent_with_state ();
 }
@@ -990,6 +968,8 @@ TimeAxisView::get_parent_with_state ()
 XMLNode&
 TimeAxisView::get_state ()
 {
+	/* XXX: is this method used? */
+	
 	XMLNode* node = new XMLNode ("TAV-" + name());
 	char buf[32];
 
@@ -1000,40 +980,45 @@ TimeAxisView::get_state ()
 }
 
 int
-TimeAxisView::set_state (const XMLNode& node)
+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 (hLargest);
+			set_height (HeightLargest);
 		} else if (prop->value() == "large") {
-			set_height (hLarge);
+			set_height (HeightLarge);
 		} else if (prop->value() == "larger") {
-			set_height (hLarger);
+			set_height (HeightLarger);
 		} else if (prop->value() == "normal") {
-			set_height (hNormal);
+			set_height (HeightNormal);
 		} else if (prop->value() == "smaller") {
-			set_height (hSmaller);
+			set_height (HeightSmaller);
 		} else if (prop->value() == "small") {
-			set_height (hSmall);
+			set_height (HeightSmall);
 		} else {
 			error << string_compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg;
-			set_height (Normal);
+			set_height (HeightNormal);
 		}
 
 	} else if ((prop = node.property ("height")) != 0) {
 
 		set_height (atoi (prop->value()));
-		
+
 	} else {
 
-		set_height (hNormal);
+		set_height (HeightNormal);
 	}
 
 	return 0;
@@ -1048,16 +1033,16 @@ TimeAxisView::reset_height()
 		(*i)->set_height ((*i)->height);
 	}
 }
-	
+
 void
-TimeAxisView::compute_controls_size_info ()
+TimeAxisView::compute_heights ()
 {
 	Gtk::Window window (Gtk::WINDOW_TOPLEVEL);
 	Gtk::Table two_row_table (2, 8);
 	Gtk::Table one_row_table (1, 8);
 	Button* buttons[5];
 	const int border_width = 2;
-	const int extra_height = (2 * border_width)
+	extra_height = (2 * border_width)
 		//+ 2   // 2 pixels for the hseparator between TimeAxisView control areas
 		+ 10; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps)
 
@@ -1079,40 +1064,13 @@ TimeAxisView::compute_controls_size_info ()
 	}
 
 	one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-	
+
 	one_row_table.show_all ();
 	Gtk::Requisition req(one_row_table.size_request ());
 
-
 	// height required to show 1 row of buttons
 
-	hSmaller = req.height + extra_height;
-
-	window.remove ();
-	window.add (two_row_table);
-
-	two_row_table.attach (*buttons[1], 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-	two_row_table.attach (*buttons[2], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-	two_row_table.attach (*buttons[3], 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-	two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
-	two_row_table.show_all ();
-	req = two_row_table.size_request ();
-
-	// height required to show all normal buttons 
-
-	hNormal = /*req.height*/ 48 + extra_height;
-
-	// these heights are all just larger than normal. no more 
-	// elements are visible (yet).
-
-	hLarger = hNormal + 50;
-	hLarge = hNormal + 150;
-	hLargest = hNormal + 250;
-
-	// height required to show track name
-
-	hSmall = 27;
+	smaller_height = req.height + extra_height;
 }
 
 void
@@ -1214,7 +1172,7 @@ TimeAxisView::covers_y_position (double y)
 				l = view()->layers() - 1;
 			}
 		}
-			
+
 		return std::make_pair (this, l);
 	}
 
@@ -1297,13 +1255,11 @@ TimeAxisView::idle_resize (uint32_t h)
 bool
 TimeAxisView::resizer_motion (GdkEventMotion* ev)
 {
-	if (_resize_drag_start < 0) {
-		return true;
-	}
-
-	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;
+	if (_resize_drag_start >= 0) {
+                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;
 }
@@ -1326,7 +1282,7 @@ TimeAxisView::resizer_expose (GdkEventExpose* event)
 	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);
@@ -1339,13 +1295,47 @@ TimeAxisView::resizer_expose (GdkEventExpose* event)
 	win->draw_line (light, 1, 5, w - 1, 5);
 	win->draw_point (light, w - 1, 4);
 
-	/* handle/line #3 */
-
-	win->draw_line (dark, 0, 8, w - 2, 8);
-	win->draw_point (dark, 0, 9);
-	win->draw_line (light, 1, 9, w - 1, 9);
-	win->draw_point (light, w - 1, 8);
+	/* use vertical resize mouse cursor */
+	win->set_cursor(Gdk::Cursor(Gdk::SB_V_DOUBLE_ARROW));
 
 	return true;
 }
 
+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;
+	case HeightLarger:
+		return extra_height + 48 + 150;
+	case HeightLarge:
+		return extra_height + 48 + 50;
+	case HeightNormal:
+		return extra_height + 48;
+	case HeightSmall:
+		return 27;
+	case HeightSmaller:
+		return smaller_height;
+	}
+
+	/* NOTREACHED */
+	return 0;
+}