X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=3f1adb9a1c19bf4bd6b8f5ac3bea9c1b8456708a;hb=ba7bbd1d51ff97af0572bfccfa9ffb3fd2a1cdbd;hp=9e0c83aa1eab4560590ae82d467272db96bb146d;hpb=cc7d4db5fe9132c38b919ab073b91d442abad9b6;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 9e0c83aa1e..3f1adb9a1c 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include <utility>
+
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
@@ -26,33 +28,35 @@
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "ardour_ui.h"
-/*
- * ardour_ui.h was moved up in the include list
- * due to a conflicting definition of 'Rect' between
- * Apple's MacTypes.h file and GTK
- */
+#include "canvas/container.h"
+#include "canvas/rectangle.h"
+#include "canvas/debug.h"
+#include "canvas/text.h"
+#include "gtkmm2ext/colors.h"
+
+#include "ardour/profile.h"
 
 #include "public_editor.h"
 #include "time_axis_view_item.h"
 #include "time_axis_view.h"
-#include "simplerect.h"
+#include "ui_config.h"
 #include "utils.h"
-#include "canvas_impl.h"
 #include "rgb_macros.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Editing;
 using namespace Glib;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace Gtkmm2ext;
 
 Pango::FontDescription TimeAxisViewItem::NAME_FONT;
 const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
-const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6;
+const double TimeAxisViewItem::GRAB_HANDLE_TOP = 0.0;
+const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 10.0;
 
 int    TimeAxisViewItem::NAME_HEIGHT;
 double TimeAxisViewItem::NAME_Y_OFFSET;
@@ -62,23 +66,37 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
 void
 TimeAxisViewItem::set_constant_heights ()
 {
-        NAME_FONT = get_font_for_style (X_("TimeAxisViewItemName"));
+	NAME_FONT = Pango::FontDescription (UIConfiguration::instance().get_SmallFont());
 
-        Gtk::Window win;
-        Gtk::Label foo;
-        win.add (foo);
+	Gtk::Window win;
+	Gtk::Label foo;
+	win.add (foo);
 
-        Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
-        int width = 0;
-        int height = 0;
+	Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
+	int width = 0;
+	int height = 0;
 
-        layout->set_font_description (NAME_FONT);
-        Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+	layout->set_font_description (NAME_FONT);
+	get_pixel_size (layout, width, height);
 
-        NAME_HEIGHT = height;
-        NAME_Y_OFFSET = height + 3;
-        NAME_HIGHLIGHT_SIZE = height + 2;
-        NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
+	layout = foo.create_pango_layout (X_("H")); /* just the ascender */
+
+	NAME_HEIGHT = height;
+
+	/* Config->get_show_name_highlight) == true:
+	        Y_OFFSET is measured from bottom of the time axis view item.
+	   Config->get_show_name_highlight) == false:
+	        Y_OFFSET is measured from the top of the time axis view item.
+	*/
+
+	if (UIConfiguration::instance().get_show_name_highlight()) {
+		NAME_Y_OFFSET = height + 1;
+		NAME_HIGHLIGHT_SIZE = height + 2;
+	} else {
+		NAME_Y_OFFSET = 3;
+		NAME_HIGHLIGHT_SIZE = 0;
+	}
+	NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
 }
 
 /**
@@ -95,17 +113,20 @@ TimeAxisViewItem::set_constant_heights ()
  * @param automation true if this is an automation region view
  */
 TimeAxisViewItem::TimeAxisViewItem(
-	const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color const & base_color,
+	const string & it_name, ArdourCanvas::Item& parent, TimeAxisView& tv, double spu, uint32_t base_color,
 	framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
 	)
 	: trackview (tv)
+	, frame_position (-1)
+	, item_name (it_name)
+	, selection_frame (0)
 	, _height (1.0)
 	, _recregion (recording)
 	, _automation (automation)
+	, _dragging (false)
+	, _width (0.0)
 {
-	group = new ArdourCanvas::Group (parent);
-
-	init (it_name, spu, base_color, start, duration, vis, true, true);
+	init (&parent, spu, base_color, start, duration, vis, true, true);
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
@@ -113,122 +134,126 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 	, Selectable (other)
 	, PBD::ScopedConnectionList()
 	, trackview (other.trackview)
+	, frame_position (-1)
+	, item_name (other.item_name)
+	, selection_frame (0)
+	, _height (1.0)
 	, _recregion (other._recregion)
 	, _automation (other._automation)
+	, _dragging (other._dragging)
+	, _width (0.0)
 {
-
-	Gdk::Color c;
-	int r,g,b,a;
-
-	UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
-	c.set_rgb_p (r/255.0, g/255.0, b/255.0);
-
 	/* share the other's parent, but still create a new group */
 
-	Gnome::Canvas::Group* parent = other.group->property_parent();
-
-	group = new ArdourCanvas::Group (*parent);
+	ArdourCanvas::Item* parent = other.group->parent();
 
 	_selected = other._selected;
 
-	init (
-		other.item_name, other.samples_per_unit, c, other.frame_position,
-		other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name
-		);
+	init (parent, other.samples_per_pixel, other.fill_color, other.frame_position,
+	      other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name);
 }
 
 void
-TimeAxisViewItem::init (
-	const string& it_name, double spu, Gdk::Color const & base_color, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high)
+TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color,
+			framepos_t start, framepos_t duration, Visibility vis,
+			bool wide, bool high)
 {
-	item_name = it_name;
-	samples_per_unit = spu;
+	group = new ArdourCanvas::Container (parent);
+	CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
+
+	fill_color = base_color;
+	fill_color_name = "time axis view item base";
+	samples_per_pixel = fpp;
 	frame_position = start;
 	item_duration = duration;
 	name_connected = false;
-	fill_opacity = 60;
 	position_locked = false;
 	max_item_duration = ARDOUR::max_framepos;
 	min_item_duration = 0;
-	show_vestigial = true;
 	visibility = vis;
 	_sensitive = true;
-	name_pixbuf_width = 0;
+	name_text_width = 0;
 	last_item_width = 0;
 	wide_enough_for_name = wide;
 	high_enough_for_name = high;
-        rect_visible = true;
 
 	if (duration == 0) {
 		warning << "Time Axis Item Duration == 0" << endl;
 	}
 
-	vestigial_frame = new ArdourCanvas::SimpleRect (*group, 0.0, 1.0, 2.0, trackview.current_height());
-	vestigial_frame->hide ();
-	vestigial_frame->property_outline_what() = 0xF;
-	vestigial_frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
-	vestigial_frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
-
 	if (visibility & ShowFrame) {
-		frame = new ArdourCanvas::SimpleRect (*group, 0.0, 1.0, trackview.editor().frame_to_pixel(duration), trackview.current_height());
+		frame = new ArdourCanvas::Rectangle (group,
+						     ArdourCanvas::Rect (0.0, 0.0,
+									 trackview.editor().sample_to_pixel(duration),
+									 trackview.current_height()));
+
+		frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+		frame->show ();
 
-		frame->property_outline_pixels() = 1;
-		frame->property_outline_what() = 0xF;
+		CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
 
 		if (_recregion) {
-			frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+			frame->set_outline_color (UIConfiguration::instance().color ("recording rect"));
 		} else {
-			frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+			frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
 		}
-
-		frame->property_outline_what() = 0x1|0x2|0x4|0x8;
-
-	} else {
-		frame = 0;
 	}
 
-	if (visibility & ShowNameHighlight) {
-
-		if (visibility & FullWidthNameHighlight) {
-			name_highlight = new ArdourCanvas::SimpleRect (*group, 0.0, trackview.editor().frame_to_pixel(item_duration), trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
-		} else {
-			name_highlight = new ArdourCanvas::SimpleRect (*group, 1.0, trackview.editor().frame_to_pixel(item_duration) - 1, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
-		}
+	if (UIConfiguration::instance().get_show_name_highlight() && (visibility & ShowNameHighlight)) {
 
+		/* rectangle size will be set in ::manage_name_highlight() */
+		name_highlight = new ArdourCanvas::Rectangle (group);
+		CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
 		name_highlight->set_data ("timeaxisviewitem", this);
-                name_highlight->property_outline_what() = 0x4;
-                /* we should really use a canvas color property here */
-		name_highlight->property_outline_color_rgba() = RGBA_TO_UINT (0,0,0,255);
+		name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
+		name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color
 
 	} else {
 		name_highlight = 0;
 	}
 
 	if (visibility & ShowNameText) {
-		name_pixbuf = new ArdourCanvas::Pixbuf(*group);
-		name_pixbuf->property_x() = NAME_X_OFFSET;
-		name_pixbuf->property_y() = trackview.current_height() + 1 - NAME_Y_OFFSET;
-
+		name_text = new ArdourCanvas::Text (group);
+		CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
+		if (UIConfiguration::instance().get_show_name_highlight()) {
+			name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
+		} else {
+			name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET));
+		}
+		name_text->set_font_description (NAME_FONT);
+		name_text->set_ignore_events (true);
 	} else {
-		name_pixbuf = 0;
+		name_text = 0;
 	}
 
 	/* create our grab handles used for trimming/duration etc */
 	if (!_recregion && !_automation) {
-		frame_handle_start = new ArdourCanvas::SimpleRect (*group, 0.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH, 5.0, trackview.current_height());
-		frame_handle_start->property_outline_what() = 0x0;
-		frame_handle_end = new ArdourCanvas::SimpleRect (*group, 0.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH, 5.0, trackview.current_height());
-		frame_handle_end->property_outline_what() = 0x0;
+		double top   = TimeAxisViewItem::GRAB_HANDLE_TOP;
+		double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH;
+
+		frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
+		CANVAS_DEBUG_NAME (frame_handle_start, "TAVI frame handle start");
+		frame_handle_start->set_outline (false);
+		frame_handle_start->set_fill (false);
+		frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_start));
+
+		frame_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
+		CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end");
+		frame_handle_end->set_outline (false);
+		frame_handle_end->set_fill (false);
+		frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_end));
 	} else {
 		frame_handle_start = frame_handle_end = 0;
 	}
 
-	set_color (base_color);
+	//set_color (base_color);
 
-	set_duration (item_duration, this);
-	set_position (start, this);
+	//set_duration (item_duration, this);
+	//set_position (start, this);
 
-	Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
+	group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
+	//Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
+	UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed));
 }
 
 TimeAxisViewItem::~TimeAxisViewItem()
@@ -236,31 +261,12 @@ TimeAxisViewItem::~TimeAxisViewItem()
 	delete group;
 }
 
-void
-TimeAxisViewItem::hide_rect ()
-{
-        rect_visible = false;
-        set_frame_color ();
-
-        if (name_highlight) {
-                name_highlight->property_outline_what() = 0x0;
-                name_highlight->property_fill_color_rgba() = UINT_RGBA_CHANGE_A(fill_color,64);
-        }
-}
-
-void
-TimeAxisViewItem::show_rect ()
+bool
+TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/)
 {
-        rect_visible = true;
-        set_frame_color ();
-
-        if (name_highlight) {
-                name_highlight->property_outline_what() = 0x4;
-                name_highlight->property_fill_color_rgba() = fill_color;
-        }
+	return false;
 }
 
-
 /**
  * Set the position of this item on the timeline.
  *
@@ -278,28 +284,20 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta)
 
 	frame_position = pos;
 
-	/*  This sucks. The GnomeCanvas version I am using
-	    doesn't correctly implement gnome_canvas_group_set_arg(),
-	    so that simply setting the "x" arg of the group
-	    fails to move the group. Instead, we have to
-	    use gnome_canvas_item_move(), which does the right
-	    thing. I see that in GNOME CVS, the current (Sept 2001)
-	    version of GNOME Canvas rectifies this issue cleanly.
-	*/
-
-	double old_unit_pos;
-	double new_unit_pos = pos / samples_per_unit;
-
-	old_unit_pos = group->property_x();
-
-	if (new_unit_pos != old_unit_pos) {
-		group->move (new_unit_pos - old_unit_pos, 0.0);
-	}
+	double new_unit_pos = trackview.editor().sample_to_pixel (pos);
 
 	if (delta) {
-		(*delta) = new_unit_pos - old_unit_pos;
+		(*delta) = new_unit_pos - group->position().x;
+		if (*delta == 0.0) {
+			return true;
+		}
+	} else {
+		if (new_unit_pos == group->position().x) {
+			return true;
+		}
 	}
 
+	group->set_x_position (new_unit_pos);
 	PositionChanged (frame_position, src); /* EMIT_SIGNAL */
 
 	return true;
@@ -324,7 +322,9 @@ bool
 TimeAxisViewItem::set_duration (framecnt_t dur, void* src)
 {
 	if ((dur > max_item_duration) || (dur < min_item_duration)) {
-		warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
+		warning << string_compose (
+				P_("new duration %1 frame is out of bounds for %2", "new duration of %1 frames is out of bounds for %2", dur),
+				get_item_name(), dur)
 			<< endmsg;
 		return false;
 	}
@@ -335,7 +335,10 @@ TimeAxisViewItem::set_duration (framecnt_t dur, void* src)
 
 	item_duration = dur;
 
-	reset_width_dependent_items (trackview.editor().frame_to_pixel (dur));
+	double end_pixel = trackview.editor().sample_to_pixel (frame_position + dur);
+	double first_pixel = trackview.editor().sample_to_pixel (frame_position);
+
+	reset_width_dependent_items (end_pixel - first_pixel);
 
 	DurationChanged (dur, src); /* EMIT_SIGNAL */
 	return true;
@@ -481,9 +484,27 @@ TimeAxisViewItem::get_item_name() const
 void
 TimeAxisViewItem::set_selected(bool yn)
 {
-	if (_selected != yn) {
-		Selectable::set_selected (yn);
-		set_frame_color ();
+	if (_selected == yn) {
+		return;
+	}
+
+	Selectable::set_selected (yn);
+	set_frame_color ();
+	set_name_text_color ();
+
+	if (_selected && frame) {
+		if (!selection_frame) {
+			selection_frame = new ArdourCanvas::Rectangle (group);
+			selection_frame->set_fill (false);
+			selection_frame->set_outline_color (UIConfiguration::instance().color ("selected time axis frame"));
+			selection_frame->set_ignore_events (true);
+		}
+		selection_frame->set (frame->get().shrink (1.0));
+		selection_frame->show ();
+	} else {
+		if (selection_frame) {
+			selection_frame->hide ();
+		}
 	}
 }
 
@@ -504,16 +525,16 @@ TimeAxisViewItem::get_time_axis_view () const
 void
 TimeAxisViewItem::set_name_text(const string& new_name)
 {
-	if (!name_pixbuf) {
+	if (!name_text) {
 		return;
 	}
 
-	last_item_width = trackview.editor().frame_to_pixel(item_duration);
-	name_pixbuf_width = pixel_width (new_name, NAME_FONT) + 2;
-	name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
+	name_text_width = pixel_width (new_name, NAME_FONT) + 2;
+	name_text->set (new_name);
+	manage_name_text ();
+	manage_name_highlight ();
 }
 
-
 /**
  * Set the height of this item.
  *
@@ -522,51 +543,70 @@ TimeAxisViewItem::set_name_text(const string& new_name)
 void
 TimeAxisViewItem::set_height (double height)
 {
-        _height = height;
+	_height = height;
 
-	if (name_highlight) {
-		if (height < NAME_HIGHLIGHT_THRESH) {
-			name_highlight->hide ();
-			high_enough_for_name = false;
+	manage_name_highlight ();
 
+	if (visibility & ShowNameText) {
+		if (UIConfiguration::instance().get_show_name_highlight()) {
+			name_text->set_y_position (height - NAME_Y_OFFSET);
 		} else {
-			name_highlight->show();
-			high_enough_for_name = true;
+			name_text->set_y_position (NAME_Y_OFFSET);
 		}
+	}
+
+	if (frame) {
 
-		if (height > NAME_HIGHLIGHT_SIZE) {
-			name_highlight->property_y1() = (double) height - 1 - NAME_HIGHLIGHT_SIZE;
-			name_highlight->property_y2() = (double) height - 1;
+		frame->set_y0 (0.0);
+		frame->set_y1 (height);
+
+		if (frame_handle_start) {
+			frame_handle_start->set_y1 (height);
+			frame_handle_end->set_y1 (height);
 		}
-		else {
-			/* it gets hidden now anyway */
-			name_highlight->property_y1() = (double) 1.0;
-			name_highlight->property_y2() = (double) height;
+
+		if (selection_frame) {
+			selection_frame->set (frame->get().shrink (1.0));
 		}
 	}
+}
 
-	if (visibility & ShowNameText) {
-		name_pixbuf->property_y() =  height + 1 - NAME_Y_OFFSET;
+void
+TimeAxisViewItem::manage_name_highlight ()
+{
+	if (!name_highlight) {
+		return;
 	}
 
-	if (frame) {
-		frame->property_y2() = height - 1;
-		if (frame_handle_start) {
-			frame_handle_start->property_y2() = height - 1;
-			frame_handle_end->property_y2() = height - 1;
-		}
+	if (_height < NAME_HIGHLIGHT_THRESH) {
+		high_enough_for_name = false;
+	} else {
+		high_enough_for_name = true;
 	}
 
-	vestigial_frame->property_y2() = height - 1;
+	if (_width < 2.0) {
+		wide_enough_for_name = false;
+	} else {
+		wide_enough_for_name = true;
+	}
 
-	update_name_pixbuf_visibility ();
-	set_colors ();
+	if (name_highlight && wide_enough_for_name && high_enough_for_name) {
+
+		name_highlight->show();
+		// name_highlight->set_x_position (1.0);
+		name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE,  _width - 2.0, _height));
+
+	} else {
+		name_highlight->hide();
+	}
+
+	manage_name_text ();
 }
 
 void
-TimeAxisViewItem::set_color (Gdk::Color const & base_color)
+TimeAxisViewItem::set_color (uint32_t base_color)
 {
-	compute_colors (base_color);
+	fill_color = base_color;
 	set_colors ();
 }
 
@@ -576,7 +616,7 @@ TimeAxisViewItem::get_canvas_frame()
 	return frame;
 }
 
-ArdourCanvas::Group*
+ArdourCanvas::Item*
 TimeAxisViewItem::get_canvas_group()
 {
 	return group;
@@ -588,118 +628,61 @@ TimeAxisViewItem::get_name_highlight()
 	return name_highlight;
 }
 
-ArdourCanvas::Pixbuf*
-TimeAxisViewItem::get_name_pixbuf()
-{
-	return name_pixbuf;
-}
-
 /**
- * Calculate some contrasting color for displaying various parts of this item, based upon the base color.
- *
- * @param color the base color of the item
+ * Convenience method to set the various canvas item colors
  */
 void
-TimeAxisViewItem::compute_colors (Gdk::Color const & base_color)
+TimeAxisViewItem::set_colors()
 {
-	unsigned char radius;
-	char minor_shift;
-
-	unsigned char r,g,b;
-
-	/* FILL: this is simple */
-	r = base_color.get_red()/256;
-	g = base_color.get_green()/256;
-	b = base_color.get_blue()/256;
-	fill_color = RGBA_TO_UINT(r,g,b,160);
-
-	/*  for minor colors:
-		if the overall saturation is strong, make the minor colors light.
-		if its weak, make them dark.
-
-   		we do this by moving an equal distance to the other side of the
-		central circle in the color wheel from where we started.
-	*/
-
-	radius = (unsigned char) rint (floor (sqrt (static_cast<double>(r*r + g*g + b+b))/3.0f));
-	minor_shift = 125 - radius;
-
-	/* LABEL: rotate around color wheel by 120 degrees anti-clockwise */
+	set_frame_color ();
 
-	r = base_color.get_red()/256;
-	g = base_color.get_green()/256;
-	b = base_color.get_blue()/256;
-
-	if (r > b)
-	{
-		if (r > g)
-		{
-			/* red sector => green */
-			swap (r,g);
-		}
-		else
-		{
-			/* green sector => blue */
-			swap (g,b);
-		}
-	}
-	else
-	{
-		if (b > g)
-		{
-			/* blue sector => red */
-			swap (b,r);
-		}
-		else
-		{
-			/* green sector => blue */
-			swap (g,b);
-		}
+	if (name_highlight) {
+		name_highlight->set_fill_color (fill_color);
 	}
 
-	r += minor_shift;
-	b += minor_shift;
-	g += minor_shift;
-
-	label_color = RGBA_TO_UINT(r,g,b,255);
-	r = (base_color.get_red()/256)   + 127;
-	g = (base_color.get_green()/256) + 127;
-	b = (base_color.get_blue()/256)  + 127;
+	set_name_text_color ();
+	set_trim_handle_colors();
+}
 
-	label_color = RGBA_TO_UINT(r,g,b,255);
+void
+TimeAxisViewItem::set_name_text_color ()
+{
+	if (!name_text) {
+		return;
+	}
 
-	/* XXX can we do better than this ? */
-	/* We're trying;) */
-	/* NUKECOLORS */
 
-	//frame_color_r = 192;
-	//frame_color_g = 192;
-	//frame_color_b = 194;
+	uint32_t f;
 
-	//selected_frame_color_r = 182;
-	//selected_frame_color_g = 145;
-	//selected_frame_color_b = 168;
+	if (UIConfiguration::instance().get_show_name_highlight()) {
+		/* name text will always be on top of name highlight, which
+		   will always use our fill color.
+		*/
+		f = fill_color;
+	} else {
+		/* name text will be on top of the item, whose color
+		   may vary depending on various conditions.
+		*/
+		f = get_fill_color ();
+	}
 
-	//handle_color_r = 25;
-	//handle_color_g = 0;
-	//handle_color_b = 255;
-	//lock_handle_color_r = 235;
-	//lock_handle_color_g = 16;
-	//lock_handle_color_b = 16;
+	name_text->set_color (contrasting_text_color (f));
 }
 
-/**
- * Convenience method to set the various canvas item colors
- */
-void
-TimeAxisViewItem::set_colors()
+Gtkmm2ext::Color
+TimeAxisViewItem::get_fill_color () const
 {
-	set_frame_color();
+	const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
 
-	if (name_highlight) {
-		name_highlight->property_fill_color_rgba() = fill_color;
+	if (_selected) {
+		return UIConfiguration::instance().color_mod ("selected region base", mod_name);
+	} else if (_recregion) {
+		return UIConfiguration::instance().color ("recording rect");
+	} else if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) &&
+	           !UIConfiguration::instance().get_color_regions_using_track_color()) {
+		return UIConfiguration::instance().color_mod (fill_color_name, mod_name);
 	}
-	set_trim_handle_colors();
+	return UIConfiguration::instance().color_mod (fill_color, mod_name);
 }
 
 /**
@@ -708,61 +691,46 @@ TimeAxisViewItem::set_colors()
 void
 TimeAxisViewItem::set_frame_color()
 {
-        uint32_t f = 0;
-
 	if (!frame) {
 		return;
 	}
 
-	if (_selected) {
+	frame->set_fill_color (get_fill_color());
+	set_frame_gradient ();
 
-                f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
-
-		if (fill_opacity) {
-                        f = UINT_RGBA_CHANGE_A (f, fill_opacity);
-		}
-
-                if (!rect_visible) {
-                        f = UINT_RGBA_CHANGE_A (f, 0);
-                }
+	if (!_recregion) {
+		frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
+	}
+}
 
-	} else {
+void
+TimeAxisViewItem::set_frame_gradient ()
+{
+	if (UIConfiguration::instance().get_timeline_item_gradient_depth() == 0.0) {
+		frame->set_gradient (ArdourCanvas::Fill::StopList (), 0);
+		return;
+	}
 
-		if (_recregion) {
-			f = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
-		} else {
+	ArdourCanvas::Fill::StopList stops;
+	double r, g, b, a;
+	double h, s, v;
+	Color f (get_fill_color());
 
-			if (high_enough_for_name && !Config->get_color_regions_using_track_color()) {
-				f = ARDOUR_UI::config()->canvasvar_FrameBase.get();
-			} else {
-				f = fill_color;
-			}
+	/* need to get alpha value */
+	color_to_rgba (f, r, g, b, a);
 
-			if (fill_opacity) {
-				f = UINT_RGBA_CHANGE_A (f, fill_opacity);
-			}
+	stops.push_back (std::make_pair (0.0, f));
 
-                        if (!rect_visible) {
-                                f = UINT_RGBA_CHANGE_A (f, 0);
-                        }
-                }
-	}
+	/* now a darker version */
 
-        frame->property_fill_color_rgba() = f;
+	color_to_hsv (f, h, s, v);
 
-        if (!_recregion) {
-                if (_selected) {
-                        f = ARDOUR_UI::config()->canvasvar_SelectedTimeAxisFrame.get();
-                } else {
-                        f = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
-                }
+	v = min (1.0, v * (1.0 - UIConfiguration::instance().get_timeline_item_gradient_depth()));
 
-                if (!rect_visible) {
-                        f = UINT_RGBA_CHANGE_A (f, 64);
-                }
+	Color darker = hsva_to_color (h, s, v, a);
+	stops.push_back (std::make_pair (1.0, darker));
 
-                frame->property_outline_color_rgba() = f;
-        }
+	frame->set_gradient (stops, true);
 }
 
 /**
@@ -771,63 +739,85 @@ TimeAxisViewItem::set_frame_color()
 void
 TimeAxisViewItem::set_trim_handle_colors()
 {
+#if 1
+	/* Leave them transparent for now */
+	if (frame_handle_start) {
+		frame_handle_start->set_fill_color (0x00000000);
+		frame_handle_end->set_fill_color (0x00000000);
+	}
+#else
 	if (frame_handle_start) {
 		if (position_locked) {
-			frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get();
-			frame_handle_end->property_fill_color_rgba() =  ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get();
+			frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked());
+			frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked());
 		} else {
-			frame_handle_start->property_fill_color_rgba() = RGBA_TO_UINT(1, 1, 1, 0); //ARDOUR_UI::config()->canvasvar_TrimHandle.get();
-			frame_handle_end->property_fill_color_rgba() = RGBA_TO_UINT(1, 1, 1, 0); //ARDOUR_UI::config()->canvasvar_TrimHandle.get();
+			frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandle());
+			frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle());
 		}
 	}
+#endif
+}
+
+bool
+TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item)
+{
+	switch (ev->type) {
+	case GDK_LEAVE_NOTIFY:
+		/* always hide the handle whenever we leave, no matter what mode */
+		item->set_fill (false);
+		break;
+	case GDK_ENTER_NOTIFY:
+		if (trackview.editor().effective_mouse_mode() == Editing::MouseObject) {
+			/* Never set this to be visible in other modes.  Note, however,
+			   that we do need to undo visibility (LEAVE_NOTIFY case above) no
+			   matter what the mode is. */
+			item->set_fill (true);
+		}
+		break;
+	default:
+		break;
+	}
+	return false;
 }
 
-/** @return the samples per unit of this item */
+/** @return the frames per pixel */
 double
-TimeAxisViewItem::get_samples_per_unit()
+TimeAxisViewItem::get_samples_per_pixel () const
 {
-	return samples_per_unit;
+	return samples_per_pixel;
 }
 
-/**
- * Set the samples per unit of this item.
- * This item is used to determine the relative visual size and position of this item
- * based upon its duration and start value.
+/** Set the frames per pixel of this item.
+ *  This item is used to determine the relative visual size and position of this item
+ *  based upon its duration and start value.
  *
- * @param spu the new samples per unit value
+ *  @param fpp the new frames per pixel
  */
 void
-TimeAxisViewItem::set_samples_per_unit (double spu)
+TimeAxisViewItem::set_samples_per_pixel (double fpp)
 {
-	samples_per_unit = spu;
+	samples_per_pixel = fpp;
 	set_position (this->get_position(), this);
-	reset_width_dependent_items ((double)get_duration() / samples_per_unit);
+
+	double end_pixel = trackview.editor().sample_to_pixel (frame_position + get_duration());
+	double first_pixel = trackview.editor().sample_to_pixel (frame_position);
+
+	reset_width_dependent_items (end_pixel - first_pixel);
 }
 
 void
 TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 {
-	if (pixel_width < GRAB_HANDLE_LENGTH * 2) {
+	_width = pixel_width;
 
-		if (frame_handle_start) {
-			frame_handle_start->hide();
-			frame_handle_end->hide();
-		}
-
-	}
+	manage_name_highlight ();
+	manage_name_text ();
 
 	if (pixel_width < 2.0) {
 
-		if (show_vestigial) {
-			vestigial_frame->show();
-		}
-
-		if (name_highlight) {
-			name_highlight->hide();
-		}
-
 		if (frame) {
-			frame->hide();
+			frame->set_outline (false);
+			frame->set_x1 (std::max(1.0, pixel_width));
 		}
 
 		if (frame_handle_start) {
@@ -835,87 +825,71 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 			frame_handle_end->hide();
 		}
 
-		wide_enough_for_name = false;
-
 	} else {
-		vestigial_frame->hide();
-
-		if (name_highlight) {
-
-			if (_height < NAME_HIGHLIGHT_THRESH) {
-				name_highlight->hide();
-				high_enough_for_name = false;
-			} else {
-				name_highlight->show();
-				if (!get_item_name().empty()) {
-					reset_name_width (pixel_width);
-				}
-				high_enough_for_name = true;
-			}
-
-			name_highlight->property_x2() = pixel_width;
-		}
-
 		if (frame) {
-			frame->show();
-			frame->property_x2() = pixel_width;
+			frame->set_outline (true);
+			/* Note: x0 is always zero - the position is defined by
+			 * the position of the group, not the frame.
+			 */
+			frame->set_x1 (pixel_width);
+
+			if (selection_frame) {
+				selection_frame->set (frame->get().shrink (1.0));
+			}
 		}
 
 		if (frame_handle_start) {
-			if (pixel_width < (2*TimeAxisViewItem::GRAB_HANDLE_LENGTH)) {
+			if (pixel_width < (3 * TimeAxisViewItem::GRAB_HANDLE_WIDTH)) {
+				/*
+				 * there's less than GRAB_HANDLE_WIDTH of the region between
+				 * the right-hand end of frame_handle_start and the left-hand
+				 * end of frame_handle_end, so disable the handles
+				 */
+
 				frame_handle_start->hide();
 				frame_handle_end->hide();
+			} else {
+				frame_handle_start->show();
+				frame_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
+				frame_handle_end->set_x1 (pixel_width);
+				frame_handle_end->show();
+
+				frame_handle_start->raise_to_top ();
+				frame_handle_end->raise_to_top ();
 			}
-			frame_handle_start->show();
-			frame_handle_end->property_x1() = pixel_width - (TimeAxisViewItem::GRAB_HANDLE_LENGTH);
-			frame_handle_end->show();
-			frame_handle_end->property_x2() = pixel_width;
 		}
-
-		wide_enough_for_name = true;
 	}
-
-        update_name_pixbuf_visibility ();
 }
 
 void
-TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
+TimeAxisViewItem::manage_name_text ()
 {
-	uint32_t it_width;
-	int pb_width;
-	bool pixbuf_holds_full_name;
+	int visible_name_width;
 
-	if (!name_pixbuf) {
+	if (!name_text) {
 		return;
 	}
 
-	it_width = trackview.editor().frame_to_pixel(item_duration);
-	pb_width = name_pixbuf_width;
-
-	pixbuf_holds_full_name = last_item_width > pb_width + NAME_X_OFFSET;
-	last_item_width = it_width;
-
-	if (pixbuf_holds_full_name && (it_width >= pb_width + NAME_X_OFFSET)) {
-		/*
-		  we've previously had the full name length showing
-		  and its still showing.
-		*/
+	if (!wide_enough_for_name || !high_enough_for_name) {
+		name_text->hide ();
 		return;
 	}
 
-	if (pb_width > it_width - NAME_X_OFFSET) {
-		pb_width = it_width - NAME_X_OFFSET;
+	if (name_text->text().empty()) {
+		name_text->hide ();
 	}
 
-	if (it_width <= NAME_X_OFFSET) {
-		wide_enough_for_name = false;
-	} else {
-		wide_enough_for_name = true;
+	visible_name_width = name_text_width;
+
+	if (visible_name_width > _width - NAME_X_OFFSET) {
+		visible_name_width = _width - NAME_X_OFFSET;
 	}
 
-	update_name_pixbuf_visibility ();
-	if (pb_width > 0) {
-		name_pixbuf->property_pixbuf() = pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
+	if (visible_name_width < 1) {
+		name_text->hide ();
+	} else {
+		name_text->clamp_width (visible_name_width);
+		name_text->show ();
 	}
 }
 
@@ -939,30 +913,29 @@ TimeAxisViewItem::idle_remove_this_item(TimeAxisViewItem* item, void* src)
 void
 TimeAxisViewItem::set_y (double y)
 {
-	double const old = group->property_y ();
-	if (y != old) {
-		group->move (0, y - old);
-	}
+	group->set_y_position (y);
 }
 
 void
-TimeAxisViewItem::update_name_pixbuf_visibility ()
+TimeAxisViewItem::parameter_changed (string p)
 {
-	if (!name_pixbuf) {
-		return;
+	if (p == "color-regions-using-track-color") {
+		set_colors ();
+	} else if (p == "timeline-item-gradient-depth") {
+		set_frame_gradient ();
 	}
+}
 
-	if (wide_enough_for_name && high_enough_for_name) {
-		name_pixbuf->show ();
-	} else {
-		name_pixbuf->hide ();
-	}
+void
+TimeAxisViewItem::drag_start ()
+{
+	_dragging = true;
+	set_frame_color ();
 }
 
 void
-TimeAxisViewItem::parameter_changed (string p)
+TimeAxisViewItem::drag_end ()
 {
-	if (p == "color-regions-using-track-color") {
-		set_frame_color ();
-	}
+	_dragging = false;
+	set_frame_color ();
 }