X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=f1797c39c9e42b4bf0bad0263cdf8396fc0e01b8;hb=79c918fd6aace3f5d94fe61973819574489ca755;hp=1752cbeae697bd2930e210590bd6b28df9ffe82a;hpb=fcfbd65268cbba8b1fd1cebc32654a43ba051d1a;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 1752cbeae6..f1797c39c9 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -32,6 +32,8 @@ #include "utils.h" #include "canvas_impl.h" #include "simpleline.h" +#include "simplerect.h" +#include "rgb_macros.h" #include @@ -43,21 +45,23 @@ using namespace Gtkmm2ext; PBD::Signal1 Marker::CatchDeletion; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& annotation, - Type type, nframes_t frame, bool handle_events) +Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, + Type type, framepos_t frame, bool handle_events) : editor (ed) , _parent (&parent) - , _line_parent (&line_parent) , _line (0) , _type (type) , _selected (false) , _shown (false) + , _line_shown (false) , _canvas_height (0) , _color (rgba) -{ - double label_offset = 0; + , _left_label_limit (DBL_MAX) + , _right_label_limit (DBL_MAX) + , _label_offset (0) +{ /* Shapes we use: Mark: @@ -67,7 +71,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro | V (0,5) (6,5) \ / - (3,10) + (3,13) TempoMark: @@ -101,29 +105,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro \ | 12,12 - - TransportStart: - - 0,0 - | \ - | \ - | \ - | \ - | \ - 0,13 --- 13,13 - - TransportEnd: - - /13,0 - / | - / | - / | - / | - / | - 0,13 ------ 13,13 - - - PunchIn: + PunchIn: 0,0 ------> 13,0 | / @@ -155,12 +137,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (6.0, 0.0)); points->push_back (Gnome::Art::Point (6.0, 5.0)); - points->push_back (Gnome::Art::Point (3.0, 10.0)); + points->push_back (Gnome::Art::Point (3.0, 13.0)); points->push_back (Gnome::Art::Point (0.0, 5.0)); points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 3; - label_offset = 8.0; + _shift = 3; + _label_offset = 8.0; break; case Tempo: @@ -174,30 +156,33 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro points->push_back (Gnome::Art::Point (0.0, 5.0)); points->push_back (Gnome::Art::Point (3.0, 0.0)); - shift = 3; - label_offset = 8.0; + _shift = 3; + _label_offset = 8.0; break; - case Start: + case SessionStart: + case RangeStart: + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (6.5, 6.5)); points->push_back (Gnome::Art::Point (0.0, 13.0)); points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 0; - label_offset = 13.0; + _shift = 0; + _label_offset = 13.0; break; - case End: + case SessionEnd: + case RangeEnd: points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (6.5, 6.5)); points->push_back (Gnome::Art::Point (13.0, 0.0)); points->push_back (Gnome::Art::Point (13.0, 13.0)); points->push_back (Gnome::Art::Point (6.5, 6.5)); - shift = 13; - label_offset = 6.0; + _shift = 13; + _label_offset = 6.0; break; case LoopStart: @@ -207,8 +192,8 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro points->push_back (Gnome::Art::Point (0.0, 13.0)); points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 0; - label_offset = 12.0; + _shift = 0; + _label_offset = 12.0; break; case LoopEnd: @@ -218,8 +203,8 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro points->push_back (Gnome::Art::Point (0.0, 13.0)); points->push_back (Gnome::Art::Point (13.0, 0.0)); - shift = 13; - label_offset = 0.0; + _shift = 13; + _label_offset = 0.0; break; case PunchIn: @@ -229,8 +214,8 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro points->push_back (Gnome::Art::Point (0.0, 13.0)); points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 0; - label_offset = 13.0; + _shift = 0; + _label_offset = 13.0; break; case PunchOut: @@ -240,20 +225,22 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro points->push_back (Gnome::Art::Point (12.0, 12.0)); points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 13; - label_offset = 0.0; + _shift = 13; + _label_offset = 0.0; break; } frame_position = frame; unit_position = editor.frame_to_unit (frame); + unit_position -= _shift; + + group = new Group (parent, unit_position, 1.0); - /* adjust to properly locate the tip */ - - unit_position -= shift; + _name_background = new ArdourCanvas::SimpleRect (*group); + _name_background->property_outline_pixels() = 1; - group = new Group (parent, unit_position, 1.0); + /* adjust to properly locate the tip */ mark = new Polygon (*group); mark->property_points() = *points; @@ -272,7 +259,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro Gtkmm2ext::get_ink_pixel_size (layout, width, name_height); name_pixbuf = new ArdourCanvas::Pixbuf(*group); - name_pixbuf->property_x() = label_offset; + name_pixbuf->property_x() = _label_offset; name_pixbuf->property_y() = (13/2) - (name_height/2); set_name (annotation.c_str()); @@ -280,6 +267,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); mark->set_data ("marker", this); + _name_background->set_data ("marker", this); if (handle_events) { group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); @@ -293,16 +281,13 @@ Marker::~Marker () CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ - delete name_pixbuf; - delete mark; - delete points; - + delete group; delete _line; } void Marker::reparent(ArdourCanvas::Group & parent) { - group->reparent(parent); + group->reparent (parent); _parent = &parent; } @@ -316,35 +301,33 @@ Marker::set_selected (bool s) void Marker::set_show_line (bool s) { - _shown = s; + _line_shown = s; setup_line (); } void Marker::setup_line () { - if (_selected || _shown) { + if (_shown && (_selected || _line_shown)) { if (_line == 0) { - _line = new ArdourCanvas::SimpleLine (*_line_parent); + _line = new ArdourCanvas::SimpleLine (*group); _line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); - _line->property_x1() = unit_position + shift; - _line->property_x2() = unit_position + shift; _line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); } + /* work out where to start the line from so that it extends from the top of the canvas */ double yo = 0; - if (!_selected) { - /* work out where to start the line from so that it extends only as far as the mark */ - double x = 0; - _parent->i2w (x, yo); - _line_parent->w2i (x, yo); - } + double xo = 0; - _line->property_y1() = yo; - _line->property_y2() = yo + _canvas_height; + _line->i2w (xo, yo); + + _line->property_x1() = _shift; + _line->property_x2() = _shift; + _line->property_y1() = -yo; // zero in world coordinates, negative in item/parent coordinate space + _line->property_y2() = -yo + _canvas_height; _line->property_color_rgba() = _selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color; _line->raise_to_top (); @@ -373,28 +356,61 @@ Marker::the_item() const void Marker::set_name (const string& new_name) { - int name_width = pixel_width (new_name, *name_font) + 2; + _name = new_name; + + setup_name_display (); +} + +/** @return true if our label is on the left of the mark, otherwise false */ +bool +Marker::label_on_left () const +{ + return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); +} + +void +Marker::setup_name_display () +{ + double limit = DBL_MAX; + + if (label_on_left ()) { + limit = _left_label_limit; + } else { + limit = _right_label_limit; + } - name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, name_font, name_width, name_height, Gdk::Color ("#000000")); + /* Work out how wide the name can be */ + int name_width = min ((double) pixel_width (_name, *name_font) + 2, limit); + if (name_width == 0) { + name_width = 1; + } - if (_type == End || _type == LoopEnd || _type == PunchOut) { - name_pixbuf->property_x() = - (name_width); + if (label_on_left ()) { + name_pixbuf->property_x() = -name_width; + } + + name_pixbuf->property_pixbuf() = pixbuf_from_string (_name, name_font, name_width, name_height, Gdk::Color ("#000000")); + + if (label_on_left ()) { + _name_background->property_x1() = name_pixbuf->property_x() - 2; + _name_background->property_x2() = name_pixbuf->property_x() + name_width + _shift; + } else { + _name_background->property_x1() = name_pixbuf->property_x() - _label_offset + 2; + _name_background->property_x2() = name_pixbuf->property_x() + name_width; } + + _name_background->property_y1() = 0; + _name_background->property_y2() = 13; } void Marker::set_position (framepos_t frame) { double new_unit_position = editor.frame_to_unit (frame); - new_unit_position -= shift; + new_unit_position -= _shift; group->move (new_unit_position - unit_position, 0.0); frame_position = frame; unit_position = new_unit_position; - - if (_line) { - _line->property_x1() = unit_position + shift; - _line->property_x2() = unit_position + shift; - } } void @@ -406,13 +422,19 @@ Marker::reposition () void Marker::show () { - group->show(); + _shown = true; + + group->show (); + setup_line (); } void Marker::hide () { - group->hide(); + _shown = false; + + group->hide (); + setup_line (); } void @@ -421,16 +443,51 @@ Marker::set_color_rgba (uint32_t c) _color = c; mark->property_fill_color_rgba() = _color; mark->property_outline_color_rgba() = _color; + if (_line && !_selected) { _line->property_color_rgba() = _color; } + + _name_background->property_fill() = true; + _name_background->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (_color, 0x70); + _name_background->property_outline_color_rgba() = _color; +} + +/** Set the number of pixels that are available for a label to the left of the centre of this marker */ +void +Marker::set_left_label_limit (double p) +{ + /* Account for the size of the marker */ + _left_label_limit = p - 13; + if (_left_label_limit < 0) { + _left_label_limit = 0; + } + + if (label_on_left ()) { + setup_name_display (); + } +} + +/** Set the number of pixels that are available for a label to the right of the centre of this marker */ +void +Marker::set_right_label_limit (double p) +{ + /* Account for the size of the marker */ + _right_label_limit = p - 13; + if (_right_label_limit < 0) { + _right_label_limit = 0; + } + + if (!label_on_left ()) { + setup_name_display (); + } } /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& text, +TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection& temp) - : Marker (editor, parent, line_parent, rgba, text, Tempo, 0, false), + : Marker (editor, parent, rgba, text, Tempo, 0, false), _tempo (temp) { set_position (_tempo.frame()); @@ -443,9 +500,9 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& text, +MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection& m) - : Marker (editor, parent, line_parent, rgba, text, Meter, 0, false), + : Marker (editor, parent, rgba, text, Meter, 0, false), _meter (m) { set_position (_meter.frame());