X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=9df14240f587c2aaf9e362cc14f6eede9c736cbd;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=a200b71f9f93e054060d4f49a2165b2c3ef4ca6c;hpb=b880a381523b2cfdb7ebd17c27fff1adf90fa028;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index a200b71f9f..9df14240f5 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -28,11 +28,13 @@
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/rectangle.h"
 #include "canvas/debug.h"
 #include "canvas/text.h"
-#include "canvas/utils.h"
+#include "canvas/colors.h"
+
+#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 /*
@@ -54,12 +56,13 @@ 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_TOP = 6;
-const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 5;
+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;
@@ -69,7 +72,7 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
 void
 TimeAxisViewItem::set_constant_heights ()
 {
-        NAME_FONT = get_font_for_style (X_("TimeAxisViewItemName"));
+        NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_SmallFont());
 
         Gtk::Window win;
         Gtk::Label foo;
@@ -80,11 +83,25 @@ TimeAxisViewItem::set_constant_heights ()
         int height = 0;
 
         layout->set_font_description (NAME_FONT);
-        Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+        get_pixel_size (layout, width, height);
+
+        layout = foo.create_pango_layout (X_("H")); /* just the ascender */
 
         NAME_HEIGHT = height;
-        NAME_Y_OFFSET = height + 5; // XXX this offset is magic
-        NAME_HIGHLIGHT_SIZE = height + 2;
+
+	/* 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 (Config->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;
 }
 
@@ -102,16 +119,18 @@ 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)
 {
 	init (&parent, spu, base_color, start, duration, vis, true, true);
 }
@@ -121,42 +140,40 @@ 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 */
 
-	ArdourCanvas::Group* parent = other.group->parent();
+	ArdourCanvas::Item* parent = other.group->parent();
 	
 	_selected = other._selected;
 	
-	init (parent, other.samples_per_pixel, c, other.frame_position,
+	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 (ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, 
+TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color, 
 			framepos_t start, framepos_t duration, Visibility vis, 
 			bool wide, bool high)
 {
-	group = new ArdourCanvas::Group (parent);
+	group = new ArdourCanvas::Container (parent);
 	CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
 	group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
 
+	fill_color = base_color;
+	_fill_color_name = "region 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;
@@ -168,55 +185,48 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
 	wide_enough_for_name = wide;
 	high_enough_for_name = high;
         rect_visible = true;
+	vestigial_frame = 0;
 
 	if (duration == 0) {
 		warning << "Time Axis Item Duration == 0" << endl;
 	}
 
-	vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 1.0, 2.0, trackview.current_height()));
-	CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
-	vestigial_frame->hide ();
-	vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
-	vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
-
 	if (visibility & ShowFrame) {
-		frame = new ArdourCanvas::Rectangle (group, 
-						     ArdourCanvas::Rect (0.0, 1.0, 
+		frame = new ArdourCanvas::TimeRectangle (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));
 
 		CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
 
 		if (_recregion) {
-			frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
+			frame->set_outline_color (ARDOUR_UI::config()->color ("recording rect"));
 		} else {
-			frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+			frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
 		}
-
-	} else {
-
-		frame = 0;
 	}
+	
+	if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
 
-	if (visibility & ShowNameHighlight) {
+		double width;
+		double start = 1.0;
 
 		if (visibility & FullWidthNameHighlight) {
-			name_highlight = new ArdourCanvas::Rectangle (group, 
-								      ArdourCanvas::Rect (0.0, trackview.editor().sample_to_pixel(item_duration),
-											  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
-											  trackview.current_height()));
-			CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
+			width = trackview.editor().sample_to_pixel(item_duration);
 		} else {
-			name_highlight = new ArdourCanvas::Rectangle (group, 
-								      ArdourCanvas::Rect (1.0, trackview.editor().sample_to_pixel(item_duration) - 1, 
-											  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
-											  trackview.current_height()));
-			CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
+			width = trackview.editor().sample_to_pixel(item_duration) - 2.0;
 		}
 
+		name_highlight = new ArdourCanvas::Rectangle (group, 
+							      ArdourCanvas::Rect (start, 
+										  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
+										  width - 2.0,
+										  trackview.current_height() - 1.0));
+		CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
 		name_highlight->set_data ("timeaxisviewitem", this);
                 name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
-                /* we should really use a canvas color property here */
 		name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255));
 
 	} else {
@@ -226,9 +236,13 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
 	if (visibility & ShowNameText) {
 		name_text = new ArdourCanvas::Text (group);
 		CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
-		name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
+		if (Config->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_text = 0;
 	}
@@ -314,28 +328,21 @@ 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_pixel;
-
-	old_unit_pos = group->position().x;
-
-	if (new_unit_pos != old_unit_pos) {
-		group->set_x_position (new_unit_pos);
-	}
+	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;
@@ -519,9 +526,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::TimeRectangle (group);
+			selection_frame->set_fill (false);
+			selection_frame->set_outline_color (ARDOUR_UI::config()->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 ();
+		}
 	}
 }
 
@@ -546,7 +571,6 @@ TimeAxisViewItem::set_name_text(const string& new_name)
 		return;
 	}
 
-	last_item_width = trackview.editor().sample_to_pixel(item_duration);
 	name_text_width = pixel_width (new_name, NAME_FONT) + 2;
 	name_text->set (new_name);
 
@@ -562,49 +586,74 @@ TimeAxisViewItem::set_height (double 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 (Config->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 (height > NAME_HIGHLIGHT_SIZE) {
-			name_highlight->set_y0 ((double) height - 1 - NAME_HIGHLIGHT_SIZE);
-			name_highlight->set_y1 ((double) height - 1);
+	if (frame) {
+		
+		frame->set_y0 (1.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->set_y0 (1);
-			name_highlight->set_y1 (height);
+
+		if (selection_frame) {
+			selection_frame->set (frame->get().shrink (1.0));
 		}
 	}
 
-	if (visibility & ShowNameText) {
-		name_text->set_y_position (height + 1 - NAME_Y_OFFSET);
+	if (vestigial_frame) {
+		vestigial_frame->set_y0 (1.0);
+		vestigial_frame->set_y1 (height);
 	}
 
-	if (frame) {
-		frame->set_y1 (height - 1);
-		if (frame_handle_start) {
-			frame_handle_start->set_y1 (height - 1);
-			frame_handle_end->set_y1 (height - 1);
-		}
+	set_colors ();
+}
+
+void
+TimeAxisViewItem::manage_name_highlight ()
+{
+	if (!name_highlight) {
+		return;
 	}
 
-	vestigial_frame->set_y1 (height - 1);
+	if (_height < NAME_HIGHLIGHT_THRESH) {
+		high_enough_for_name = false;
+	} else {
+		high_enough_for_name = true;
+	}
 
-	update_name_text_visibility ();
-	set_colors ();
+	if (_width < 2.0) {
+		wide_enough_for_name = false;
+	} else {
+		wide_enough_for_name = true;
+	}
+
+	if (name_highlight && wide_enough_for_name && high_enough_for_name) {
+
+		name_highlight->show();
+		name_highlight->set (ArdourCanvas::Rect (1.0, (double) _height - NAME_HIGHLIGHT_SIZE,  _width, (double) _height - 1.0));
+			
+	} 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 ();
 }
 
@@ -614,7 +663,7 @@ TimeAxisViewItem::get_canvas_frame()
 	return frame;
 }
 
-ArdourCanvas::Group*
+ArdourCanvas::Item*
 TimeAxisViewItem::get_canvas_group()
 {
 	return group;
@@ -627,192 +676,96 @@ TimeAxisViewItem::get_name_highlight()
 }
 
 /**
- * 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;
+	set_frame_color ();
 
-	/* LABEL: rotate around color wheel by 120 degrees anti-clockwise */
-
-	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;
-
-	label_color = RGBA_TO_UINT(r,g,b,255);
-
-	/* XXX can we do better than this ? */
-	/* We're trying;) */
-	/* NUKECOLORS */
-
-	//frame_color_r = 192;
-	//frame_color_g = 192;
-	//frame_color_b = 194;
-
-	//selected_frame_color_r = 182;
-	//selected_frame_color_g = 145;
-	//selected_frame_color_b = 168;
-
-	//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;
+	set_name_text_color ();
+	set_trim_handle_colors();
 }
 
-/**
- * Convenience method to set the various canvas item colors
- */
 void
-TimeAxisViewItem::set_colors()
+TimeAxisViewItem::set_name_text_color ()
 {
-	set_frame_color();
-
-	if (name_highlight) {
-		name_highlight->set_fill_color (fill_color);
+	if (!name_text) {
+		return;
 	}
+	
 
-	if (name_text) {
-		double r, g, b, a;
-
-		const double black_r = 0.0;
-		const double black_g = 0.0;
-		const double black_b = 0.0;
-
-		const double white_r = 1.0;
-		const double white_g = 1.0;
-		const double white_b = 1.0;
-
-		ArdourCanvas::color_to_rgba (fill_color, r, g, b, a);
-		
-		/* Use W3C contrast guideline calculation */
-
-		double white_contrast = (max (r, white_r) - min (r, white_r)) +
-			(max (g, white_g) - min (g, white_g)) + 
-			(max (b, white_b) - min (b, white_b));
-
-		double black_contrast = (max (r, black_r) - min (r, black_r)) +
-			(max (g, black_g) - min (g, black_g)) + 
-			(max (b, black_b) - min (b, black_b));
-
-		if (white_contrast > black_contrast) {		
-			/* use white */
-			name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0));
-		} else {
-			/* use black */
-			name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0));
-		}
-
-#if 0
-		double h, s, v;
-
-		ArdourCanvas::color_to_hsv (fill_color, h, s, v);
-
-		if (v == 0.0) {
-			/* fill is black, set text to white */
-			name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0));
-		} else if (v == 1.0) {
-			/* fill is white, set text to black */
-			name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0));
-		} else {
+	uint32_t f;
+	
+	if (Config->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 ();
+	}
 
-			h = fabs (fmod ((h - 180), 360.0)); /* complementary color */
-			s = 1.0; /* fully saturate */
-			v = 0.9; /* increase lightness/brightness/value */
+	name_text->set_color (ArdourCanvas::contrasting_text_color (f));
+}
 
-			name_text->set_color (ArdourCanvas::hsv_to_color (h, s, v, 1.0));
-		}
-#endif
+uint32_t
+TimeAxisViewItem::fill_opacity () const
+{
+	if (!rect_visible) {
+		/* if the frame/rect is marked as "invisible", then the
+		   fill should be translucent.parent.
+		*/
+		return 64;
+	}
 
+	if (_dragging) {
+		return 130;
 	}
-	
-	set_trim_handle_colors();
+
+	uint32_t col = ARDOUR_UI::config()->color_mod (_fill_color_name, _fill_color_name);
+	return UINT_RGBA_A (col);
 }
 
 uint32_t
 TimeAxisViewItem::get_fill_color () const
 {
-        uint32_t f = 0;
+	uint32_t f;
+	uint32_t o = fill_opacity ();
 
 	if (_selected) {
 
-                f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
+		f = ARDOUR_UI::config()->color ("selected region base");
 
+		if (o == 0) {
+			/* some condition of this item has set fill opacity to
+			 * zero, but it has been selected, so use a mid-way
+			 * alpha value to make it reasonably visible.
+			 */
+			o = 130;
+		}
+		
 	} else {
 
 		if (_recregion) {
-			f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+			f = ARDOUR_UI::config()->color ("recording rect");
 		} else {
-
-			if (high_enough_for_name && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-				f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+			if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+				f = ARDOUR_UI::config()->color_mod (_fill_color_name, _fill_color_name);
 			} else {
 				f = fill_color;
 			}
 		}
 	}
 
-	return f;
+	return UINT_RGBA_CHANGE_A (f, o);
 }
 
 /**
@@ -821,38 +774,23 @@ TimeAxisViewItem::get_fill_color () const
 void
 TimeAxisViewItem::set_frame_color()
 {
-        uint32_t f = 0;
-
 	if (!frame) {
 		return;
 	}
 
-	f = get_fill_color ();
-
-	if (fill_opacity) {
-		f = UINT_RGBA_CHANGE_A (f, fill_opacity);
-	}
-	
-	if (!rect_visible) {
-		f = UINT_RGBA_CHANGE_A (f, 0);
-	}
-
-        frame->set_fill_color (f);
+	frame->set_fill_color (get_fill_color());
 	set_frame_gradient ();
 
-        if (!_recregion) {
-                if (_selected) {
-                        f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
-                } else {
-                        f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame();
-                }
+	if (!_recregion) {
+		uint32_t f = ARDOUR_UI::config()->color ("time axis frame");
 
-                if (!rect_visible) {
-                        f = UINT_RGBA_CHANGE_A (f, 64);
-                }
+		if (!rect_visible) {
+			/* make the frame outline be visible but rather transparent */
+			f = UINT_RGBA_CHANGE_A (f, 64);
+		}
 
-                frame->set_outline_color (f);
-        }
+		frame->set_outline_color (f);
+	}
 }
 
 void
@@ -879,7 +817,7 @@ TimeAxisViewItem::set_frame_gradient ()
 
 	v = min (1.0, v * (1.0 - ARDOUR_UI::config()->get_timeline_item_gradient_depth()));
 	
-	ArdourCanvas::Color darker = ArdourCanvas::hsv_to_color (h, s, v, a);
+	ArdourCanvas::Color darker = ArdourCanvas::hsva_to_color (h, s, v, a);
 	stops.push_back (std::make_pair (1.0, darker));
 	
 	frame->set_gradient (stops, true);
@@ -891,15 +829,23 @@ TimeAxisViewItem::set_frame_gradient ()
 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->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
-			frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
+			frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
+			frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
 		} else {
-			frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
-			frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
+			frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
+			frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
 		}
 	}
+#endif
 }
 
 bool
@@ -907,10 +853,16 @@ TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle*
 {
 	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:
-		item->set_fill (true);
+		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;
@@ -942,14 +894,24 @@ TimeAxisViewItem::set_samples_per_pixel (double fpp)
 void
 TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 {
+	_width = pixel_width;
+
+	manage_name_highlight ();
+	manage_name_text ();
+
 	if (pixel_width < 2.0) {
 
 		if (show_vestigial) {
-			vestigial_frame->show();
-		}
 
-		if (name_highlight) {
-			name_highlight->hide();
+			if (!vestigial_frame) {
+				vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
+				CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
+				vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("vestigial frame"));
+				vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame"));
+				vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+			}
+
+			vestigial_frame->show();
 		}
 
 		if (frame) {
@@ -961,30 +923,18 @@ 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->set_x1 (pixel_width);
+		if (vestigial_frame) {
+			vestigial_frame->hide();
 		}
 
 		if (frame) {
 			frame->show();
 			frame->set_x1 (pixel_width);
+
+			if (selection_frame) {
+				selection_frame->set (frame->get().shrink (1.0));
+			}
 		}
 
 		if (frame_handle_start) {
@@ -1004,56 +954,39 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 				frame_handle_end->show();
 			}
 		}
-
-		wide_enough_for_name = true;
 	}
-
-        update_name_text_visibility ();
 }
 
 void
-TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
+TimeAxisViewItem::manage_name_text ()
 {
-	uint32_t it_width;
-	int pb_width;
-	bool showing_full_name;
+	int visible_name_width;
 
 	if (!name_text) {
 		return;
 	}
 
-	it_width = trackview.editor().sample_to_pixel(item_duration);
-	pb_width = name_text_width;
-
-	showing_full_name = last_item_width > pb_width + NAME_X_OFFSET;
-	last_item_width = it_width;
-
-	if (showing_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 (it_width <= NAME_X_OFFSET) {
-		wide_enough_for_name = false;
-	} else {
-		wide_enough_for_name = true;
+		
+	if (name_text->text().empty()) {
+		name_text->hide ();
 	}
 
-	update_name_text_visibility ();
+	visible_name_width = name_text_width;
 
-	if (pb_width < 1) {
-		pb_width = 1;
+	if (visible_name_width > _width - NAME_X_OFFSET) {
+		visible_name_width = _width - NAME_X_OFFSET;
 	}
 
-	name_text->set (item_name);
-	name_text->clamp_width (pb_width);
+	if (visible_name_width < 1) {
+		name_text->hide ();
+	} else {
+		name_text->clamp_width (visible_name_width);
+		name_text->show ();
+	}
 }
 
 /**
@@ -1079,20 +1012,6 @@ TimeAxisViewItem::set_y (double y)
 	group->set_y_position (y);
 }
 
-void
-TimeAxisViewItem::update_name_text_visibility ()
-{
-	if (!name_text) {
-		return;
-	}
-
-	if (wide_enough_for_name && high_enough_for_name) {
-		name_text->show ();
-	} else {
-		name_text->hide ();
-	}
-}
-
 void
 TimeAxisViewItem::parameter_changed (string p)
 {
@@ -1102,3 +1021,17 @@ TimeAxisViewItem::parameter_changed (string p)
 		set_frame_gradient ();
 	}
 }
+
+void
+TimeAxisViewItem::drag_start ()
+{
+	_dragging = true;
+	set_frame_color ();
+}
+
+void
+TimeAxisViewItem::drag_end ()
+{
+	_dragging = false;
+	set_frame_color ();
+}