a-fluidsynth: implement LV2_BANKPATCH__notify
[ardour.git] / gtk2_ardour / time_axis_view_item.cc
index dedacaa27c672ae0f657f61f07f5ece1cb5ef64e..3f1adb9a1c19bf4bd6b8f5ac3bea9c1b8456708a 100644 (file)
 
 */
 
+#include <utility>
+
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
 #include "ardour/types.h"
 #include "ardour/ardour.h"
 
-#include <gtkmm2ext/utils.h>
+#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;
 
-//------------------------------------------------------------------------------
-/** Initialize const static memeber data */
-
-Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0;
-bool TimeAxisViewItem::have_name_font = false;
+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;
 double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE;
 double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
 
-//---------------------------------------------------------------------------------------//
-// Constructor / Desctructor
-
-/**
- * Constructs a new TimeAxisViewItem.
- *
- * @param it_name the unique name/Id of this item
- * @param parant the parent canvas group
- * @param tv the TimeAxisView we are going to be added to
- * @param spu samples per unit
- * @param base_color
- * @param start the start point of this item
- * @param duration the duration of this item
- */
-TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color const & base_color,
-                                  nframes64_t start, nframes64_t duration, bool recording,
-                                  Visibility vis)
-       : trackview (tv), _recregion(recording)
+void
+TimeAxisViewItem::set_constant_heights ()
 {
-       if (!have_name_font) {
+       NAME_FONT = Pango::FontDescription (UIConfiguration::instance().get_SmallFont());
 
-               /* first constructed item sets up font info */
+       Gtk::Window win;
+       Gtk::Label foo;
+       win.add (foo);
 
-               NAME_FONT = get_font_for_style (N_("TimeAxisViewItemName"));
+       Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
+       int width = 0;
+       int height = 0;
 
-               Gtk::Window win;
-               Gtk::Label foo;
-               win.add (foo);
+       layout->set_font_description (NAME_FONT);
+       get_pixel_size (layout, width, height);
 
-               Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
-               int width = 0;
-               int height = 0;
+       layout = foo.create_pango_layout (X_("H")); /* just the ascender */
 
-               layout->set_font_description (*NAME_FONT);
-               Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+       NAME_HEIGHT = height;
 
-               NAME_HEIGHT = height;
-               NAME_Y_OFFSET = height + 3;
-               NAME_HIGHLIGHT_SIZE = height + 2;
-               NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
+       /* 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.
+       */
 
-               have_name_font = true;
+       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;
+}
 
-       group = new ArdourCanvas::Group (parent);
-
-       init (it_name, spu, base_color, start, duration, vis, true, true);
-
+/**
+ * Construct a new TimeAxisViewItem.
+ *
+ * @param it_name the unique name of this item
+ * @param parent the parent canvas group
+ * @param tv the TimeAxisView we are going to be added to
+ * @param spu samples per unit
+ * @param base_color
+ * @param start the start point of this item
+ * @param duration the duration of this item
+ * @param recording true if this is a recording region view
+ * @param automation true if this is an automation region view
+ */
+TimeAxisViewItem::TimeAxisViewItem(
+       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);
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
-       : sigc::trackable(other)
+       : trackable (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, nframes64_t start, nframes64_t duration, Visibility vis, bool wide, bool high
-       )
-{
-       item_name = it_name ;
-       samples_per_unit = spu ;
-       should_show_selection = true;
-       frame_position = start ;
-       item_duration = duration ;
+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::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_frames;
-       min_item_duration = 0 ;
-       show_vestigial = true;
+       position_locked = false;
+       max_item_duration = ARDOUR::max_framepos;
+       min_item_duration = 0;
        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;
 
        if (duration == 0) {
-               warning << "Time Axis Item Duration == 0" << endl ;
+               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->property_outline_pixels() = 1;
-               frame->property_outline_what() = 0xF;
-               frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+               frame = new ArdourCanvas::Rectangle (group,
+                                                    ArdourCanvas::Rect (0.0, 0.0,
+                                                                        trackview.editor().sample_to_pixel(duration),
+                                                                        trackview.current_height()));
 
-               /* by default draw all 4 edges */
+               frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+               frame->show ();
 
-               uint32_t outline_what = 0x1|0x2|0x4|0x8;
-
-               if (visibility & HideFrameLeft) {
-                       outline_what &= ~(0x1);
-               }
+               CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
 
-               if (visibility & HideFrameRight) {
-                       outline_what &= ~(0x2);
-               }
-
-               if (visibility & HideFrameTB) {
-                       outline_what &= ~(0x4 | 0x8);
+               if (_recregion) {
+                       frame->set_outline_color (UIConfiguration::instance().color ("recording rect"));
+               } else {
+                       frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
                }
-
-               frame->property_outline_what() = outline_what;
-
-       } 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() - 1);
-               } 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() - 1);
-               }
+       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->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 */
-       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;
+       if (!_recregion && !_automation) {
+               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;
+       }
 
-       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;
+       //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) ;
+       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));
 }
 
-/**
- * Destructor
- */
 TimeAxisViewItem::~TimeAxisViewItem()
 {
        delete group;
 }
 
-
-//---------------------------------------------------------------------------------------//
-// Position and duration Accessors/Mutators
+bool
+TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/)
+{
+       return false;
+}
 
 /**
- * Set the position of this item upon the timeline to the specified value
+ * Set the position of this item on the timeline.
  *
  * @param pos the new position
  * @param src the identity of the object that initiated the change
- * @return true if the position change was a success, false otherwise
+ * @return true on success
  */
+
 bool
-TimeAxisViewItem::set_position(nframes64_t pos, void* src, double* delta)
+TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta)
 {
        if (position_locked) {
                return false;
@@ -259,56 +284,47 @@ TimeAxisViewItem::set_position(nframes64_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;
+               }
        }
 
-       PositionChanged (frame_position, src) ; /* EMIT_SIGNAL */
+       group->set_x_position (new_unit_pos);
+       PositionChanged (frame_position, src); /* EMIT_SIGNAL */
 
        return true;
 }
 
-/**
- * Return the position of this item upon the timeline
- *
- * @return the position of this item
- */
-nframes64_t
+/** @return position of this item on the timeline */
+framepos_t
 TimeAxisViewItem::get_position() const
 {
        return frame_position;
 }
 
 /**
- * Sets the duration of this item
+ * Set the duration of this item.
  *
  * @param dur the new duration of this item
  * @param src the identity of the object that initiated the change
- * @return true if the duration change was succesful, false otherwise
+ * @return true on success
  */
+
 bool
-TimeAxisViewItem::set_duration (nframes64_t dur, void* src)
+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;
        }
@@ -319,99 +335,86 @@ TimeAxisViewItem::set_duration (nframes64_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);
 
-       DurationChanged (dur, src) ; /* EMIT_SIGNAL */
+       reset_width_dependent_items (end_pixel - first_pixel);
+
+       DurationChanged (dur, src); /* EMIT_SIGNAL */
        return true;
 }
 
-/**
- * Returns the duration of this item
- *
- */
-nframes64_t
+/** @return duration of this item */
+framepos_t
 TimeAxisViewItem::get_duration() const
 {
-       return (item_duration);
+       return item_duration;
 }
 
 /**
- * Sets the maximum duration that this item make have.
+ * Set the maximum duration that this item can have.
  *
  * @param dur the new maximum duration
  * @param src the identity of the object that initiated the change
  */
 void
-TimeAxisViewItem::set_max_duration(nframes64_t dur, void* src)
+TimeAxisViewItem::set_max_duration(framecnt_t dur, void* src)
 {
-       max_item_duration = dur ;
-       MaxDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */
+       max_item_duration = dur;
+       MaxDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */
 }
 
-/**
- * Returns the maxmimum duration that this item may be set to
- *
- * @return the maximum duration that this item may be set to
- */
-nframes64_t
+/** @return the maximum duration that this item may have */
+framecnt_t
 TimeAxisViewItem::get_max_duration() const
 {
-       return (max_item_duration) ;
+       return max_item_duration;
 }
 
 /**
- * Sets the minimu duration that this item may be set to
+ * Set the minimum duration that this item may have.
  *
  * @param the minimum duration that this item may be set to
  * @param src the identity of the object that initiated the change
  */
 void
-TimeAxisViewItem::set_min_duration(nframes64_t dur, void* src)
+TimeAxisViewItem::set_min_duration(framecnt_t dur, void* src)
 {
-       min_item_duration = dur ;
-       MinDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */
+       min_item_duration = dur;
+       MinDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */
 }
 
-/**
- * Returns the minimum duration that this item mey be set to
- *
- * @return the nimum duration that this item mey be set to
- */
-nframes64_t
+/** @return the minimum duration that this item mey have */
+framecnt_t
 TimeAxisViewItem::get_min_duration() const
 {
-       return(min_item_duration) ;
+       return min_item_duration;
 }
 
 /**
- * Sets whether the position of this Item is locked to its current position
+ * Set whether this item is locked to its current position.
  * Locked items cannot be moved until the item is unlocked again.
  *
- * @param yn set to true to lock this item to its current position
+ * @param yn true to lock this item to its current position
  * @param src the identity of the object that initiated the change
  */
 void
 TimeAxisViewItem::set_position_locked(bool yn, void* src)
 {
-       position_locked = yn ;
-       set_trim_handle_colors() ;
+       position_locked = yn;
+       set_trim_handle_colors();
        PositionLockChanged (position_locked, src); /* EMIT_SIGNAL */
 }
 
-/**
- * Returns whether this item is locked to its current position
- *
- * @return true if this item is locked to its current posotion
- *         false otherwise
- */
+/** @return true if this item is locked to its current position */
 bool
 TimeAxisViewItem::get_position_locked() const
 {
-       return (position_locked);
+       return position_locked;
 }
 
 /**
- * Sets whether the Maximum Duration constraint is active and should be enforced
+ * Set whether the maximum duration constraint is active.
  *
  * @param active set true to enforce the max duration constraint
  * @param src the identity of the object that initiated the change
@@ -422,329 +425,264 @@ TimeAxisViewItem::set_max_duration_active (bool active, void* /*src*/)
        max_duration_active = active;
 }
 
-/**
- * Returns whether the Maximum Duration constraint is active and should be enforced
- *
- * @return true if the maximum duration constraint is active, false otherwise
- */
+/** @return true if the maximum duration constraint is active */
 bool
 TimeAxisViewItem::get_max_duration_active() const
 {
-       return(max_duration_active) ;
+       return max_duration_active;
 }
 
 /**
- * Sets whether the Minimum Duration constraint is active and should be enforced
+ * Set whether the minimum duration constraint is active.
  *
  * @param active set true to enforce the min duration constraint
  * @param src the identity of the object that initiated the change
  */
+
 void
 TimeAxisViewItem::set_min_duration_active (bool active, void* /*src*/)
 {
-       min_duration_active = active ;
+       min_duration_active = active;
 }
 
-/**
- * Returns whether the Maximum Duration constraint is active and should be enforced
- *
- * @return true if the maximum duration constraint is active, false otherwise
- */
+/** @return true if the maximum duration constraint is active */
 bool
 TimeAxisViewItem::get_min_duration_active() const
 {
-       return(min_duration_active) ;
+       return min_duration_active;
 }
 
-//---------------------------------------------------------------------------------------//
-// Name/Id Accessors/Mutators
-
 /**
- * Set the name/Id of this item.
+ * Set the name of this item.
  *
  * @param new_name the new name of this item
  * @param src the identity of the object that initiated the change
  */
+
 void
 TimeAxisViewItem::set_item_name(std::string new_name, void* src)
 {
        if (new_name != item_name) {
-               std::string temp_name = item_name ;
-               item_name = new_name ;
-               NameChanged (item_name, temp_name, src) ; /* EMIT_SIGNAL */
+               std::string temp_name = item_name;
+               item_name = new_name;
+               NameChanged (item_name, temp_name, src); /* EMIT_SIGNAL */
        }
 }
 
-/**
- * Returns the name/id of this item
- *
- * @return the name/id of this item
- */
+/** @return the name of this item */
 std::string
 TimeAxisViewItem::get_item_name() const
 {
-       return(item_name) ;
+       return item_name;
 }
 
-//---------------------------------------------------------------------------------------//
-// Selection Methods
-
 /**
- * Set to true to indicate that this item is currently selected
+ * Set selection status.
  *
  * @param yn true if this item is currently selected
- * @param src the identity of the object that initiated the change
  */
 void
 TimeAxisViewItem::set_selected(bool yn)
 {
-       if (_selected != yn) {
-               Selectable::set_selected (yn);
-               set_frame_color ();
+       if (_selected == yn) {
+               return;
        }
-}
 
-void
-TimeAxisViewItem::set_should_show_selection (bool yn)
-{
-       if (should_show_selection != yn) {
-               should_show_selection = yn;
-               set_frame_color ();
+       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 ();
+               }
        }
 }
 
-//---------------------------------------------------------------------------------------//
-// Parent Componenet Methods
-
-/**
- * Returns the TimeAxisView that this item is upon
- *
- * @return the timeAxisView that this item is placed upon
- */
+/** @return the TimeAxisView that this item is on */
 TimeAxisView&
-TimeAxisViewItem::get_time_axis_view()
+TimeAxisViewItem::get_time_axis_view () const
 {
        return trackview;
 }
-//---------------------------------------------------------------------------------------//
-// ui methods & data
 
 /**
- * Sets the displayed item text
- * This item is the visual text name displayed on the canvas item, this can be different to the name of the item
+ * Set the displayed item text.
+ * This item is the visual text name displayed on the canvas item, this can be different to the name of the item.
  *
  * @param new_name the new name text to display
  */
+
 void
-TimeAxisViewItem::set_name_text(const ustring& new_name)
+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_ustring(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
+ * Set the height of this item.
  *
- * @param h the new height
+ * @param h new height
  */
 void
 TimeAxisViewItem::set_height (double height)
 {
-       if (name_highlight) {
-               if (height < NAME_HIGHLIGHT_THRESH) {
-                       name_highlight->hide ();
-                       high_enough_for_name = false;
+       _height = height;
 
+       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 - 2;
+               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;
-               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;
+       }
+
+       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();
+       }
 
-       update_name_pixbuf_visibility ();
+       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 ();
 }
 
-/**
- *
- */
 ArdourCanvas::Item*
 TimeAxisViewItem::get_canvas_frame()
 {
-       return(frame) ;
+       return frame;
 }
 
-/**
- *
- */
-ArdourCanvas::Group*
+ArdourCanvas::Item*
 TimeAxisViewItem::get_canvas_group()
 {
-       return (group) ;
+       return group;
 }
 
-/**
- *
- */
 ArdourCanvas::Item*
 TimeAxisViewItem::get_name_highlight()
 {
-       return (name_highlight) ;
+       return name_highlight;
 }
 
 /**
- *
- */
-ArdourCanvas::Pixbuf*
-TimeAxisViewItem::get_name_pixbuf()
-{
-       return (name_pixbuf) ;
-}
-
-/**
- * Calculates 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;
-               name_highlight->property_outline_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);
 }
 
 /**
@@ -753,78 +691,133 @@ TimeAxisViewItem::set_colors()
 void
 TimeAxisViewItem::set_frame_color()
 {
-       if (frame) {
-               uint32_t r,g,b,a;
+       if (!frame) {
+               return;
+       }
 
-               if (_selected && should_show_selection) {
-                       UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
-                       frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
-               } else {
-                       if (_recregion) {
-                               UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a);
-                               frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
-                       } else {
-                               UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a);
-                               frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);
-                       }
-               }
+       frame->set_fill_color (get_fill_color());
+       set_frame_gradient ();
+
+       if (!_recregion) {
+               frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
        }
 }
 
+void
+TimeAxisViewItem::set_frame_gradient ()
+{
+       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;
+       Color f (get_fill_color());
+
+       /* need to get alpha value */
+       color_to_rgba (f, r, g, b, a);
+
+       stops.push_back (std::make_pair (0.0, f));
+
+       /* now a darker version */
+
+       color_to_hsv (f, h, s, v);
+
+       v = min (1.0, v * (1.0 - UIConfiguration::instance().get_timeline_item_gradient_depth()));
+
+       Color darker = hsva_to_color (h, s, v, a);
+       stops.push_back (std::make_pair (1.0, darker));
+
+       frame->set_gradient (stops, true);
+}
+
 /**
- * Sets the colors of the start and end trim handle depending on object state
- *
+ * Set the colors of the start and end trim handle depending on object state
  */
 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 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 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 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) {
-
-               if (frame_handle_start) {
-                       frame_handle_start->hide();
-                       frame_handle_end->hide();
-               }
+       _width = pixel_width;
 
-       } if (pixel_width < 2.0) {
+       manage_name_highlight ();
+       manage_name_text ();
 
-               if (show_vestigial) {
-                       vestigial_frame->show();
-               }
-
-               if (name_highlight) {
-                       name_highlight->hide();
-               }
+       if (pixel_width < 2.0) {
 
                if (frame) {
-                       frame->hide();
+                       frame->set_outline (false);
+                       frame->set_x1 (std::max(1.0, pixel_width));
                }
 
                if (frame_handle_start) {
@@ -832,129 +825,86 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                        frame_handle_end->hide();
                }
 
-               wide_enough_for_name = false;
-
        } else {
-               vestigial_frame->hide();
-
-               if (name_highlight) {
-
-                       double height = name_highlight->property_y2 ();
-
-                       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;
-                       }
-
-                       if (visibility & FullWidthNameHighlight) {
-                               name_highlight->property_x2() = pixel_width;
-                       } else {
-                               name_highlight->property_x2() = pixel_width - 1.0;
-                       }
-
-               }
-
                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;
                }
        }
 }
 
 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 (it_width <= NAME_X_OFFSET) {
-               wide_enough_for_name = false;
-       } else {
-               wide_enough_for_name = true;
-       }
 
-       update_name_pixbuf_visibility ();
-       if (pb_width > 0) {
-               name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
+       if (name_text->text().empty()) {
+               name_text->hide ();
        }
-}
 
+       visible_name_width = name_text_width;
 
-//---------------------------------------------------------------------------------------//
-// Handle time axis removal
+       if (visible_name_width > _width - NAME_X_OFFSET) {
+               visible_name_width = _width - NAME_X_OFFSET;
+       }
 
-/**
- * Handles the Removal of this time axis item
- * This _needs_ to be called to alert others of the removal properly, ie where the source
- * of the removal came from.
- *
- * XXX Although im not too happy about this method of doing things, I cant think of a cleaner method
- *     just now to capture the source of the removal
- *
- * @param src the identity of the object that initiated the change
- */
-void
-TimeAxisViewItem::remove_this_item(void* src)
-{
-       /*
-          defer to idle loop, otherwise we'll delete this object
-          while we're still inside this function ...
-       */
-        Glib::signal_idle().connect(sigc::bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src));
+       if (visible_name_width < 1) {
+               name_text->hide ();
+       } else {
+               name_text->clamp_width (visible_name_width);
+               name_text->show ();
+       }
 }
 
 /**
- * Callback used to remove this time axis item during the gtk idle loop
+ * Callback used to remove this time axis item during the gtk idle loop.
  * This is used to avoid deleting the obejct while inside the remove_this_item
- * method
+ * method.
  *
- * @param item the TimeAxisViewItem to remove
- * @param src the identity of the object that initiated the change
+ * @param item the TimeAxisViewItem to remove.
+ * @param src the identity of the object that initiated the change.
  */
 gint
 TimeAxisViewItem::idle_remove_this_item(TimeAxisViewItem* item, void* src)
 {
-       item->ItemRemoved (item->get_item_name(), src) ; /* EMIT_SIGNAL */
+       item->ItemRemoved (item->get_item_name(), src); /* EMIT_SIGNAL */
        delete item;
        item = 0;
        return false;
@@ -963,23 +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 (wide_enough_for_name && high_enough_for_name) {
-               name_pixbuf->show ();
-       } else {
-               name_pixbuf->hide ();
+       if (p == "color-regions-using-track-color") {
+               set_colors ();
+       } else if (p == "timeline-item-gradient-depth") {
+               set_frame_gradient ();
        }
 }
 
+void
+TimeAxisViewItem::drag_start ()
+{
+       _dragging = true;
+       set_frame_color ();
+}
+
+void
+TimeAxisViewItem::drag_end ()
+{
+       _dragging = false;
+       set_frame_color ();
+}