Some HIG and wording improvements to the right-click region context menu. Closes...

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 9cf5969fd76736f486262545918a58e1eb758cc7..f4848228f8286ac13e89263ffea60d2e92069fbd 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -40,6 +40,8 @@
 using namespace std;
 using namespace ARDOUR;
 
+PBD::Signal1<void,Marker*> Marker::CatchDeletion;
+
 Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation,
                Type type, nframes_t frame, bool handle_events)
 
@@ -270,12 +272,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
        set_name (annotation.c_str());
 
-       editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition));
+       editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition));
 
        mark->set_data ("marker", this);
 
        if (handle_events) {
-               group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
+               group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
        }
 
        line = 0;
@@ -285,7 +287,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
 Marker::~Marker ()
 {
-       drop_references ();
+       CatchDeletion (this); /* EMIT SIGNAL */
 
        /* destroying the parent group destroys its contents, namely any polygons etc. that we added */
        delete name_pixbuf;
@@ -324,7 +326,7 @@ Marker::add_line (ArdourCanvas::Group* group, double y_origin, double initial_he
                line->property_x2() = unit_position + shift;
                line->property_y2() = y_origin + initial_height;
 
-               line->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
+               line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
        }
 
        show_line ();
@@ -356,40 +358,13 @@ Marker::the_item() const
 void
 Marker::set_name (const string& new_name)
 {
-       uint32_t pb_width;
-       double font_size;
-
-       if (new_name.empty()) {
-               return;
-       }
-
-       font_size = name_font->get_size() / Pango::SCALE;
-       pb_width = new_name.length() * font_size;
-
-       Glib::RefPtr<Gdk::Pixbuf> buf = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, pb_width, name_height);
+       int name_width = pixel_width (new_name, *name_font) + 2;
 
-       cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, pb_width, name_height);
-       cairo_t *cr = cairo_create (surface);
-       cairo_text_extents_t te;
-       cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
-       cairo_select_font_face (cr, name_font->get_family().c_str(),
-                               CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-       cairo_set_font_size (cr, font_size);
-       cairo_text_extents (cr, new_name.c_str(), &te);
-
-       cairo_move_to (cr, 0.5,
-                      0.5 - te.height / 2 - te.y_bearing + name_height / 2);
-       cairo_show_text (cr, new_name.c_str());
-
-       unsigned char* src = cairo_image_surface_get_data (surface);
-       convert_bgra_to_rgba(src, buf->get_pixels(), pb_width, name_height);
-
-       cairo_destroy(cr);
-       name_pixbuf->property_pixbuf() = buf;
+       name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height, Gdk::Color ("#000000"));
 
        if (_type == End || _type == LoopEnd || _type == PunchOut) {
-               name_pixbuf->property_x() = -(te.width);
-        }
+               name_pixbuf->property_x() = - (name_width);
+       }
 }
 
 void
@@ -440,7 +415,7 @@ TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, gui
          _tempo (temp)
 {
        set_position (_tempo.frame());
-       group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this));
+       group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this));
 }
 
 TempoMarker::~TempoMarker ()
@@ -455,7 +430,7 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, gui
          _meter (m)
 {
        set_position (_meter.frame());
-       group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this));
+       group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this));
 }
 
 MeterMarker::~MeterMarker ()