X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=987e5411446d9ab81d91aa4c5a34c7468c132a3c;hb=7a05dde39d2c98e1317e84c19629d6a7634799e2;hp=ebda7312d46ada29786bed2eafc3af33d4cfbdc0;hpb=11619a37bff79c050e39e434bc9899b516cbe4a1;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index ebda7312d4..987e541144 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -31,9 +31,12 @@
 #include "canvas/group.h"
 #include "canvas/rectangle.h"
 #include "canvas/debug.h"
+#include "canvas/drag_handle.h"
 #include "canvas/text.h"
 #include "canvas/utils.h"
 
+#include "ardour/profile.h"
+
 #include "ardour_ui.h"
 /*
  * ardour_ui.h was moved up in the include list
@@ -58,8 +61,9 @@ 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;
+const double TimeAxisViewItem::RIGHT_EDGE_SHIFT = 1.0;
 
 int    TimeAxisViewItem::NAME_HEIGHT;
 double TimeAxisViewItem::NAME_Y_OFFSET;
@@ -80,11 +84,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;
 }
 
@@ -106,12 +124,15 @@ TimeAxisViewItem::TimeAxisViewItem(
 	framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
 	)
 	: trackview (tv)
+	, frame_position (-1)
+	, item_name (it_name)
 	, _height (1.0)
 	, _recregion (recording)
 	, _automation (automation)
 	, _dragging (false)
+	, _width (0.0)
 {
-	init (it_name, &parent, spu, base_color, start, duration, vis, true, true);
+	init (&parent, spu, base_color, start, duration, vis, true, true);
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
@@ -119,9 +140,13 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 	, Selectable (other)
 	, PBD::ScopedConnectionList()
 	, trackview (other.trackview)
+	, frame_position (-1)
+	, item_name (other.item_name)
+	, _height (1.0)
 	, _recregion (other._recregion)
 	, _automation (other._automation)
 	, _dragging (other._dragging)
+	, _width (0.0)
 {
 
 	Gdk::Color c;
@@ -136,12 +161,12 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 	
 	_selected = other._selected;
 	
-	init (other.item_name, parent, other.samples_per_pixel, c, other.frame_position,
+	init (parent, other.samples_per_pixel, c, 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, ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, 
+TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, 
 			framepos_t start, framepos_t duration, Visibility vis, 
 			bool wide, bool high)
 {
@@ -149,7 +174,6 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 	CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
 	group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
 
-	item_name = it_name;
 	samples_per_pixel = fpp;
 	frame_position = start;
 	item_duration = duration;
@@ -179,10 +203,17 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 
 	if (visibility & ShowFrame) {
 		frame = new ArdourCanvas::Rectangle (group, 
-						     ArdourCanvas::Rect (0.0, 1.0, 
-									 trackview.editor().sample_to_pixel(duration), 
-									 trackview.current_height()));
+						     ArdourCanvas::Rect (0.0, 0.0, 
+									 trackview.editor().sample_to_pixel(duration) + RIGHT_EDGE_SHIFT, 
+									 trackview.current_height() - 1.0));
+
 		CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
+		
+		if (Config->get_show_name_highlight()) {
+			frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+		} else {
+			frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM));
+		}
 
 		if (_recregion) {
 			frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
@@ -194,26 +225,28 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 
 		frame = 0;
 	}
+	
+	if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
 
-	if (visibility & ShowNameHighlight) {
+		double width;
+		double start;
 
 		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()));
+			start = 0.0;
+			width = trackview.editor().sample_to_pixel(item_duration) + RIGHT_EDGE_SHIFT;
 		} 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()));
+			start = 1.0;
+			width = trackview.editor().sample_to_pixel(item_duration) - 2.0 + RIGHT_EDGE_SHIFT;
 		}
 
+		name_highlight = new ArdourCanvas::Rectangle (group, 
+							      ArdourCanvas::Rect (start, 
+										  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
+										  width - 2.0 + RIGHT_EDGE_SHIFT,
+										  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 {
@@ -223,9 +256,12 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 	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);
-		
 	} else {
 		name_text = 0;
 	}
@@ -235,13 +271,13 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 		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()));
+		frame_handle_start = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), true);
 		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()));
+		frame_handle_end = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), false);
 		CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end");
 		frame_handle_end->set_outline (false);
 		frame_handle_end->set_fill (false);
@@ -311,28 +347,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;
@@ -543,7 +572,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);
 
@@ -559,45 +587,60 @@ 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;
-		}
-
-		if (height > NAME_HIGHLIGHT_SIZE) {
-			name_highlight->set_y0 ((double) height - 1 - NAME_HIGHLIGHT_SIZE);
-			name_highlight->set_y1 ((double) height - 1);
+			name_text->set_y_position (NAME_Y_OFFSET); 
 		}
-		else {
-			/* it gets hidden now anyway */
-			name_highlight->set_y0 (1);
-			name_highlight->set_y1 (height);
-		}
-	}
-
-	if (visibility & ShowNameText) {
-		name_text->set_y_position (height + 1 - NAME_Y_OFFSET);
 	}
 
 	if (frame) {
-		frame->set_y1 (height - 1);
+		frame->set_y1 (height);
 		if (frame_handle_start) {
-			frame_handle_start->set_y1 (height - 1);
-			frame_handle_end->set_y1 (height - 1);
+			frame_handle_start->set_y1 (height);
+			frame_handle_end->set_y1 (height);
 		}
 	}
 
-	vestigial_frame->set_y1 (height - 1);
+	vestigial_frame->set_y1 (height - 1.0);
 
-	update_name_text_visibility ();
 	set_colors ();
 }
 
+void
+TimeAxisViewItem::manage_name_highlight ()
+{
+	if (!name_highlight) {
+		return;
+	}
+
+	if (_height < NAME_HIGHLIGHT_THRESH) {
+		high_enough_for_name = false;
+	} else {
+		high_enough_for_name = true;
+	}
+
+	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 (0.0, (double) _height - NAME_HIGHLIGHT_SIZE,  _width+RIGHT_EDGE_SHIFT, (double) _height - 1.0));
+			
+	} else {
+		name_highlight->hide();
+	}
+
+	manage_name_text ();
+}
+
 void
 TimeAxisViewItem::set_color (Gdk::Color const & base_color)
 {
@@ -631,90 +674,14 @@ TimeAxisViewItem::get_name_highlight()
 void
 TimeAxisViewItem::compute_colors (Gdk::Color const & base_color)
 {
-	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 */
+	/* FILL: change opacity to a fixed value */
 
 	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);
-		}
-	}
-
-	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;
+	fill_color = RGBA_TO_UINT(r,g,b,160);
 }
 
 /**
@@ -726,61 +693,127 @@ TimeAxisViewItem::set_colors()
 	set_frame_color();
 
 	if (name_highlight) {
-		name_highlight->set_fill_color (fill_color);
+                name_highlight->set_fill_color (fill_color);
 	}
+
+	set_name_text_color ();
 	set_trim_handle_colors();
 }
 
-/**
- * Sets the frame color depending on whether this item is selected
- */
 void
-TimeAxisViewItem::set_frame_color()
+TimeAxisViewItem::set_name_text_color ()
 {
-        uint32_t f = 0;
-
-	if (!frame) {
+	if (!name_text) {
 		return;
 	}
+	
+	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;
+
+	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 ();
+	}
+
+	ArdourCanvas::color_to_rgba (f, 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));
+	}
+}
+
+uint32_t
+TimeAxisViewItem::get_fill_color () const
+{
+        uint32_t f;
+	uint32_t o;
 
 	if (_selected) {
 
                 f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
 
-		if (fill_opacity) {
-                        f = UINT_RGBA_CHANGE_A (f, fill_opacity);
+		if (fill_opacity != 0) {
+			o = fill_opacity;
+		} else {
+			/* 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;
 		}
-
-                if (!rect_visible) {
-                        f = UINT_RGBA_CHANGE_A (f, 0);
-                }
-
+		
 	} else {
 
 		if (_recregion) {
 			f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
 		} else {
 
-			if (high_enough_for_name && !Config->get_color_regions_using_track_color()) {
+			if (high_enough_for_name && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
 				f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
 			} else {
 				f = fill_color;
 			}
+		}
 
-			if (fill_opacity) {
-				f = UINT_RGBA_CHANGE_A (f, fill_opacity);
-			}
+		/* tweak opacity */
 
-                        if (!rect_visible) {
-                                f = UINT_RGBA_CHANGE_A (f, 0);
-                        }
-                }
+		if (!rect_visible) {
+			o = 0;
+		} else {
+			o = fill_opacity;
+		}
+
+	}
+
+	return UINT_RGBA_CHANGE_A (f, o);
+}
+
+/**
+ * Sets the frame color depending on whether this item is selected
+ */
+void
+TimeAxisViewItem::set_frame_color()
+{
+	if (!frame) {
+		return;
 	}
 
-        frame->set_fill_color (f);
+        frame->set_fill_color (get_fill_color());
 	set_frame_gradient ();
 
         if (!_recregion) {
+		uint32_t f;
+
                 if (_selected) {
                         f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
                 } else {
@@ -788,6 +821,7 @@ TimeAxisViewItem::set_frame_color()
                 }
 
                 if (!rect_visible) {
+			/* make the frame outline be visible but rather transparent */
                         f = UINT_RGBA_CHANGE_A (f, 64);
                 }
 
@@ -806,7 +840,7 @@ TimeAxisViewItem::set_frame_gradient ()
 	ArdourCanvas::Fill::StopList stops;
 	double r, g, b, a;
 	double h, s, v;
-	ArdourCanvas::Color f (frame->fill_color());
+	ArdourCanvas::Color f (get_fill_color());
 
 	/* need to get alpha value */
 	ArdourCanvas::color_to_rgba (f, r, g, b, a);
@@ -816,15 +850,13 @@ TimeAxisViewItem::set_frame_gradient ()
 	/* now a darker version */
 	
 	ArdourCanvas::color_to_hsv (f, h, s, v);
-	s *= ARDOUR_UI::config()->get_timeline_item_gradient_depth();
-	if (s > 1.0) {
-		s = 1.0;
-	}
+
+	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);
 	stops.push_back (std::make_pair (1.0, darker));
 	
-	frame->set_gradient (stops, _height);
+	frame->set_gradient (stops, true);
 }
 
 /**
@@ -833,6 +865,13 @@ 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());
@@ -842,6 +881,7 @@ TimeAxisViewItem::set_trim_handle_colors()
 			frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
 		}
 	}
+#endif
 }
 
 bool
@@ -849,10 +889,19 @@ 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 &&
+		    !trackview.editor().internal_editing()) {
+			/* never set this to be visible in internal
+			   edit mode. 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;
@@ -884,16 +933,17 @@ 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 (frame) {
 			frame->hide();
 		}
@@ -903,30 +953,12 @@ 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 (frame) {
 			frame->show();
-			frame->set_x1 (pixel_width);
+			frame->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
 		}
 
 		if (frame_handle_start) {
@@ -941,61 +973,44 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 				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->set_x0 (pixel_width + RIGHT_EDGE_SHIFT - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
+				frame_handle_end->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
 				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 ();
+	}
 }
 
 /**
@@ -1021,25 +1036,11 @@ 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)
 {
 	if (p == "color-regions-using-track-color") {
-		set_frame_color ();
+		set_colors ();
 	} else if (p == "timeline-item-gradient-depth") {
 		set_frame_gradient ();
 	}