X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=61ac7283077a8f9c2fe69ba4e57f7a6be8ed01d4;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=987e5411446d9ab81d91aa4c5a34c7468c132a3c;hpb=c22e96522d9275db4b1b4ba8edddbda5e7f798b9;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 987e541144..61ac728307 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -28,42 +28,35 @@
 #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/drag_handle.h"
 #include "canvas/text.h"
-#include "canvas/utils.h"
+#include "canvas/colors.h"
 
 #include "ardour/profile.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 "public_editor.h"
 #include "time_axis_view_item.h"
 #include "time_axis_view.h"
+#include "ui_config.h"
 #include "utils.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_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;
@@ -73,7 +66,7 @@ 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;
@@ -90,13 +83,13 @@ TimeAxisViewItem::set_constant_heights ()
 
         NAME_HEIGHT = height;
 
-	/* Config->get_show_name_highlight) == true: 
+	/* Config->get_show_name_highlight) == true:
 	        Y_OFFSET is measured from bottom of the time axis view item.
-	   Config->get_show_name_highlight) == false: 
+	   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()) {
+	if (UIConfiguration::instance().get_show_name_highlight()) {
 		NAME_Y_OFFSET = height + 1;
 		NAME_HIGHLIGHT_SIZE = height + 2;
 	} else {
@@ -120,12 +113,13 @@ 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)
@@ -142,112 +136,77 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 	, 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, 
-			framepos_t start, framepos_t duration, Visibility vis, 
+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 = "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_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::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, 0.0, 
-									 trackview.editor().sample_to_pixel(duration) + RIGHT_EDGE_SHIFT, 
-									 trackview.current_height() - 1.0));
+		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 ();
 
 		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());
+			frame->set_outline_color (UIConfiguration::instance().color ("recording rect"));
 		} else {
-			frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+			frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
 		}
-
-	} else {
-
-		frame = 0;
 	}
-	
-	if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
-
-		double width;
-		double start;
 
-		if (visibility & FullWidthNameHighlight) {
-			start = 0.0;
-			width = trackview.editor().sample_to_pixel(item_duration) + RIGHT_EDGE_SHIFT;
-		} else {
-			start = 1.0;
-			width = trackview.editor().sample_to_pixel(item_duration) - 2.0 + RIGHT_EDGE_SHIFT;
-		}
+	if (UIConfiguration::instance().get_show_name_highlight() && (visibility & ShowNameHighlight)) {
 
-		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));
+		/* 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->set_outline_what (ArdourCanvas::Rectangle::TOP);
-		name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255));
+                name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color
 
 	} else {
 		name_highlight = 0;
@@ -256,12 +215,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()));
-		if (Config->get_show_name_highlight()) {
+		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_text = 0;
 	}
@@ -271,13 +231,13 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
 		double top   = TimeAxisViewItem::GRAB_HANDLE_TOP;
 		double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH;
 
-		frame_handle_start = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), true);
+		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::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), false);
+		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);
@@ -286,13 +246,14 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
 		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), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
-	ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed));
+	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()
@@ -306,30 +267,6 @@ TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/)
 	return false;
 }
 
-void
-TimeAxisViewItem::hide_rect ()
-{
-        rect_visible = false;
-        set_frame_color ();
-
-        if (name_highlight) {
-                name_highlight->set_outline_what (ArdourCanvas::Rectangle::What (0));
-                name_highlight->set_fill_color (UINT_RGBA_CHANGE_A (fill_color, 64));
-        }
-}
-
-void
-TimeAxisViewItem::show_rect ()
-{
-        rect_visible = true;
-        set_frame_color ();
-
-        if (name_highlight) {
-                name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
-                name_highlight->set_fill_color (fill_color);
-        }
-}
-
 /**
  * Set the position of this item on the timeline.
  *
@@ -361,7 +298,6 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta)
 	}
 
 	group->set_x_position (new_unit_pos);
-
 	PositionChanged (frame_position, src); /* EMIT_SIGNAL */
 
 	return true;
@@ -399,7 +335,10 @@ TimeAxisViewItem::set_duration (framecnt_t dur, void* src)
 
 	item_duration = dur;
 
-	reset_width_dependent_items (trackview.editor().sample_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;
@@ -545,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 ();
+		}
 	}
 }
 
@@ -574,7 +531,8 @@ TimeAxisViewItem::set_name_text(const string& new_name)
 
 	name_text_width = pixel_width (new_name, NAME_FONT) + 2;
 	name_text->set (new_name);
-
+	manage_name_text ();
+	manage_name_highlight ();
 }
 
 /**
@@ -590,24 +548,27 @@ TimeAxisViewItem::set_height (double height)
 	manage_name_highlight ();
 
 	if (visibility & ShowNameText) {
-		if (Config->get_show_name_highlight()) {
-			name_text->set_y_position (height - NAME_Y_OFFSET); 
+		if (UIConfiguration::instance().get_show_name_highlight()) {
+			name_text->set_y_position (height - NAME_Y_OFFSET);
 		} else {
-			name_text->set_y_position (NAME_Y_OFFSET); 
+			name_text->set_y_position (NAME_Y_OFFSET);
 		}
 	}
 
 	if (frame) {
+
+		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);
 		}
-	}
-
-	vestigial_frame->set_y1 (height - 1.0);
 
-	set_colors ();
+		if (selection_frame) {
+			selection_frame->set (frame->get().shrink (1.0));
+		}
+	}
 }
 
 void
@@ -632,8 +593,9 @@ TimeAxisViewItem::manage_name_highlight ()
 	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));
-			
+		// 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();
 	}
@@ -642,9 +604,9 @@ TimeAxisViewItem::manage_name_highlight ()
 }
 
 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 ();
 }
 
@@ -654,7 +616,7 @@ TimeAxisViewItem::get_canvas_frame()
 	return frame;
 }
 
-ArdourCanvas::Group*
+ArdourCanvas::Item*
 TimeAxisViewItem::get_canvas_group()
 {
 	return group;
@@ -666,31 +628,13 @@ TimeAxisViewItem::get_name_highlight()
 	return 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
- */
-void
-TimeAxisViewItem::compute_colors (Gdk::Color const & base_color)
-{
-	unsigned char r,g,b;
-
-	/* 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;
-	fill_color = RGBA_TO_UINT(r,g,b,160);
-}
-
 /**
  * Convenience method to set the various canvas item colors
  */
 void
 TimeAxisViewItem::set_colors()
 {
-	set_frame_color();
+	set_frame_color ();
 
 	if (name_highlight) {
                 name_highlight->set_fill_color (fill_color);
@@ -706,20 +650,11 @@ TimeAxisViewItem::set_name_text_color ()
 	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()) {
+
+	if (UIConfiguration::instance().get_show_name_highlight()) {
 		/* name text will always be on top of name highlight, which
 		   will always use our fill color.
 		*/
@@ -731,71 +666,23 @@ TimeAxisViewItem::set_name_text_color ()
 		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));
-	}
+	name_text->set_color (ArdourCanvas::contrasting_text_color (f));
 }
 
-uint32_t
+ArdourCanvas::Color
 TimeAxisViewItem::get_fill_color () const
 {
-        uint32_t f;
-	uint32_t o;
+	const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
 
 	if (_selected) {
-
-                f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
-
-		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;
-		}
-		
-	} else {
-
-		if (_recregion) {
-			f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
-		} else {
-
-			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;
-			}
-		}
-
-		/* tweak opacity */
-
-		if (!rect_visible) {
-			o = 0;
-		} else {
-			o = fill_opacity;
-		}
-
+		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);
 	}
-
-	return UINT_RGBA_CHANGE_A (f, o);
+	return UIConfiguration::instance().color_mod (fill_color, mod_name);
 }
 
 /**
@@ -808,35 +695,22 @@ TimeAxisViewItem::set_frame_color()
 		return;
 	}
 
-        frame->set_fill_color (get_fill_color());
+	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 {
-                        f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame();
-                }
-
-                if (!rect_visible) {
-			/* make the frame outline be visible but rather transparent */
-                        f = UINT_RGBA_CHANGE_A (f, 64);
-                }
-
-                frame->set_outline_color (f);
-        }
+	if (!_recregion) {
+		frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
+	}
 }
 
 void
 TimeAxisViewItem::set_frame_gradient ()
 {
-	if (ARDOUR_UI::config()->get_timeline_item_gradient_depth() == 0.0) {
+	if (UIConfiguration::instance().get_timeline_item_gradient_depth() == 0.0) {
 		frame->set_gradient (ArdourCanvas::Fill::StopList (), 0);
 		return;
 	}
-		
+
 	ArdourCanvas::Fill::StopList stops;
 	double r, g, b, a;
 	double h, s, v;
@@ -844,18 +718,18 @@ TimeAxisViewItem::set_frame_gradient ()
 
 	/* need to get alpha value */
 	ArdourCanvas::color_to_rgba (f, r, g, b, a);
-	
+
 	stops.push_back (std::make_pair (0.0, f));
-	
+
 	/* now a darker version */
-	
+
 	ArdourCanvas::color_to_hsv (f, h, s, v);
 
-	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);
+	v = min (1.0, v * (1.0 - UIConfiguration::instance().get_timeline_item_gradient_depth()));
+
+	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);
 }
 
@@ -874,11 +748,11 @@ TimeAxisViewItem::set_trim_handle_colors()
 #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 (UIConfiguration::instance().get_TrimHandleLocked());
+			frame_handle_end->set_fill_color (UIConfiguration::instance().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 (UIConfiguration::instance().get_TrimHandle());
+			frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle());
 		}
 	}
 #endif
@@ -893,13 +767,10 @@ TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle*
 		item->set_fill (false);
 		break;
 	case GDK_ENTER_NOTIFY:
-		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.
-			*/
+		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;
@@ -927,7 +798,11 @@ TimeAxisViewItem::set_samples_per_pixel (double fpp)
 {
 	samples_per_pixel = fpp;
 	set_position (this->get_position(), this);
-	reset_width_dependent_items ((double) get_duration() / samples_per_pixel);
+
+	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
@@ -940,12 +815,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 
 	if (pixel_width < 2.0) {
 
-		if (show_vestigial) {
-			vestigial_frame->show();
-		}
-
 		if (frame) {
-			frame->hide();
+			frame->set_outline (false);
+			frame->set_x1 (std::max(1.0, pixel_width));
 		}
 
 		if (frame_handle_start) {
@@ -954,17 +826,22 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 		}
 
 	} else {
-		vestigial_frame->hide();
-
 		if (frame) {
-			frame->show();
-			frame->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
+			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 < (3 * TimeAxisViewItem::GRAB_HANDLE_WIDTH)) {
 				/*
-				 * there's less than GRAB_HANDLE_WIDTH of the region between 
+				 * 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
 				 */
@@ -973,8 +850,8 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 				frame_handle_end->hide();
 			} else {
 				frame_handle_start->show();
-				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->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
+				frame_handle_end->set_x1 (pixel_width);
 				frame_handle_end->show();
 			}
 		}
@@ -994,7 +871,7 @@ TimeAxisViewItem::manage_name_text ()
 		name_text->hide ();
 		return;
 	}
-		
+
 	if (name_text->text().empty()) {
 		name_text->hide ();
 	}
@@ -1045,3 +922,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 ();
+}