Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index af201286a9bd1f53997478ca92982a94ac33a781..33135181d5392324d6ebcae4e301291b5a15dc5e 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -248,7 +248,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
        group->name = string_compose ("Marker::group for %1", annotation);
 #endif 
 
-       _name_background = new ArdourCanvas::Rectangle (group);
+       _name_background = new ArdourCanvas::TimeRectangle (group);
 #ifdef CANVAS_DEBUG
        _name_background->name = string_compose ("Marker::_name_background for %1", annotation);
 #endif 
@@ -331,7 +331,7 @@ Marker::setup_line ()
                if (_track_canvas_line == 0) {
 
                        _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
-                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
+                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->color ("edit point"));
                        _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
@@ -342,7 +342,7 @@ Marker::setup_line ()
                _track_canvas_line->set_x1 (d.x);
                _track_canvas_line->set_y0 (d.y);
                _track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX);
-               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
+               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->color ("edit point") : _color);
                _track_canvas_line->raise_to_top ();
                _track_canvas_line->show ();
 
@@ -408,11 +408,14 @@ Marker::setup_name_display ()
                _name_item->set (_name);
                
                if (label_on_left ()) {
+                       /* adjust right edge of background to fit text */
                        _name_background->set_x0 (_name_item->position().x - 2);
                        _name_background->set_x1 (_name_item->position().x + name_width + _shift);
                } else {
-                       _name_background->set_x0 (_name_item->position().x - _label_offset + 2);
-                       _name_background->set_x1 (_name_item->position().x + name_width);
+                       /* right edge remains at zero (group-relative). Add
+                        * arbitrary 4 pixels of extra padding at the end
+                        */
+                       _name_background->set_x1 (_name_item->position().x + name_width + 4.0);
                }
        }