X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=af201286a9bd1f53997478ca92982a94ac33a781;hb=779fe6c08291a2c041ec9558c5351c23de576238;hp=652a43657e1ebe273fe3765329d9d19c04f92541;hpb=283e3ceb04286c2045236ff01bc2db6cf4c70957;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 652a43657e..af201286a9 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -21,11 +21,12 @@ #include "ardour/tempo.h" #include "canvas/rectangle.h" -#include "canvas/group.h" +#include "canvas/container.h" #include "canvas/line.h" #include "canvas/polygon.h" #include "canvas/text.h" #include "canvas/canvas.h" +#include "canvas/scroll_group.h" #include "canvas/debug.h" #include "ardour_ui.h" @@ -46,16 +47,18 @@ using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace Gtkmm2ext; PBD::Signal1 Marker::CatchDeletion; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, +static const double marker_height = 13.0; + +Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, Type type, framepos_t frame, bool handle_events) : editor (ed) , _parent (&parent) - , _time_bars_line (0) , _track_canvas_line (0) , _type (type) , _selected (false) @@ -76,7 +79,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con | V (0,5) (6,5) \ / - (3,13) + (3,marker_height) TempoMark: @@ -112,25 +115,25 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con PunchIn: - 0,0 ------> 13,0 + 0,0 ------> marker_height,0 | / | / | / | / | / | / - 0,13 + 0,marker_height PunchOut - 0,0 -->-13,0 + 0,0 -->-marker_height,0 \ | \ | \ | \ | \ | \ | - 13,13 + marker_height,marker_height */ @@ -142,7 +145,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con points->push_back (ArdourCanvas::Duple (0.0, 0.0)); points->push_back (ArdourCanvas::Duple (6.0, 0.0)); points->push_back (ArdourCanvas::Duple (6.0, 5.0)); - points->push_back (ArdourCanvas::Duple (3.0, 13.0)); + points->push_back (ArdourCanvas::Duple (3.0, marker_height)); points->push_back (ArdourCanvas::Duple (0.0, 5.0)); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); @@ -171,30 +174,30 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con points = new ArdourCanvas::Points (); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); points->push_back (ArdourCanvas::Duple (6.5, 6.5)); - points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); _shift = 0; - _label_offset = 13.0; + _label_offset = marker_height; break; case SessionEnd: case RangeEnd: points = new ArdourCanvas::Points (); points->push_back (ArdourCanvas::Duple (6.5, 6.5)); - points->push_back (ArdourCanvas::Duple (13.0, 0.0)); - points->push_back (ArdourCanvas::Duple (13.0, 13.0)); + points->push_back (ArdourCanvas::Duple (marker_height, 0.0)); + points->push_back (ArdourCanvas::Duple (marker_height, marker_height)); points->push_back (ArdourCanvas::Duple (6.5, 6.5)); - _shift = 13; + _shift = marker_height; _label_offset = 6.0; break; case LoopStart: points = new ArdourCanvas::Points (); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - points->push_back (ArdourCanvas::Duple (13.0, 13.0)); - points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (marker_height, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); _shift = 0; @@ -203,24 +206,24 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con case LoopEnd: points = new ArdourCanvas::Points (); - points->push_back (ArdourCanvas::Duple (13.0, 0.0)); - points->push_back (ArdourCanvas::Duple (13.0, 13.0)); - points->push_back (ArdourCanvas::Duple (0.0, 13.0)); - points->push_back (ArdourCanvas::Duple (13.0, 0.0)); + points->push_back (ArdourCanvas::Duple (marker_height, 0.0)); + points->push_back (ArdourCanvas::Duple (marker_height, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); + points->push_back (ArdourCanvas::Duple (marker_height, 0.0)); - _shift = 13; + _shift = marker_height; _label_offset = 0.0; break; case PunchIn: points = new ArdourCanvas::Points (); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - points->push_back (ArdourCanvas::Duple (13.0, 0.0)); - points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (marker_height, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); _shift = 0; - _label_offset = 13.0; + _label_offset = marker_height; break; case PunchOut: @@ -230,7 +233,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con points->push_back (ArdourCanvas::Duple (12.0, 12.0)); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - _shift = 13; + _shift = marker_height; _label_offset = 0.0; break; @@ -240,7 +243,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con unit_position = editor.sample_to_pixel (frame); unit_position -= _shift; - group = new ArdourCanvas::Group (&parent, ArdourCanvas::Duple (unit_position, 0)); + group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 0)); #ifdef CANVAS_DEBUG group->name = string_compose ("Marker::group for %1", annotation); #endif @@ -273,7 +276,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con CANVAS_DEBUG_NAME (_name_item, string_compose ("Marker::_name_item for %1", annotation)); _name_item->set_font_description (name_font); _name_item->set_color (RGBA_TO_UINT (0,0,0,255)); - _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0) - 2.0)); + _name_item->set_position (ArdourCanvas::Duple (_label_offset, (marker_height / 2.0) - (name_height / 2.0) - 2.0)); set_name (annotation.c_str()); @@ -297,11 +300,10 @@ Marker::~Marker () /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ delete group; - delete _time_bars_line; delete _track_canvas_line; } -void Marker::reparent(ArdourCanvas::Group & parent) +void Marker::reparent(ArdourCanvas::Container & parent) { group->reparent (&parent); _parent = &parent; @@ -326,29 +328,16 @@ Marker::setup_line () { if (_shown && (_selected || _line_shown)) { - if (_time_bars_line == 0) { + if (_track_canvas_line == 0) { - _time_bars_line = new ArdourCanvas::Line (editor.get_time_bars_group()); - _time_bars_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint()); - _time_bars_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); - - _track_canvas_line = new ArdourCanvas::Line (editor.get_track_canvas_group()); + _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->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } - ArdourCanvas::Duple g = group->item_to_canvas (ArdourCanvas::Duple (0, 0)); - ArdourCanvas::Duple d = _time_bars_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0)); + ArdourCanvas::Duple g = group->canvas_origin(); + ArdourCanvas::Duple d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0)); - _time_bars_line->set_x0 (d.x); - _time_bars_line->set_x1 (d.x); - _time_bars_line->set_y0 (d.y); - _time_bars_line->set_y1 (ArdourCanvas::COORD_MAX); - _time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color); - _time_bars_line->raise_to_top (); - _time_bars_line->show (); - - d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0)); _track_canvas_line->set_x0 (d.x); _track_canvas_line->set_x1 (d.x); _track_canvas_line->set_y0 (d.y); @@ -358,8 +347,7 @@ Marker::setup_line () _track_canvas_line->show (); } else { - if (_time_bars_line) { - _time_bars_line->hide (); + if (_track_canvas_line) { _track_canvas_line->hide (); } } @@ -408,28 +396,29 @@ Marker::setup_name_display () int name_width = min ((double) pixel_width (_name, name_font) + 2, limit); if (name_width == 0) { - name_width = 1; - } - - if (label_on_left ()) { - _name_item->set_x_position (-name_width); - } - - _name_item->set (_name); - - // CAIROCANVAS - // need to "clip" name to name_width and name_height - - if (label_on_left ()) { - _name_background->set_x0 (_name_item->position().x - 2); - _name_background->set_x1 (_name_item->position().x + name_width + _shift); + _name_item->hide (); } else { - _name_background->set_x0 (_name_item->position().x - _label_offset + 2); - _name_background->set_x1 (_name_item->position().x + name_width); + _name_item->show (); + + if (label_on_left ()) { + _name_item->set_x_position (-name_width); + } + + _name_item->clamp_width (name_width); + _name_item->set (_name); + + if (label_on_left ()) { + _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); + } } _name_background->set_y0 (0); - _name_background->set_y1 (13); + /* unfortunate hard coding - this has to * match the marker bars height */ + _name_background->set_y1 (marker_height + 1.0); } void @@ -472,8 +461,7 @@ Marker::set_color_rgba (uint32_t c) mark->set_fill_color (_color); mark->set_outline_color (_color); - if (_time_bars_line && !_selected) { - _time_bars_line->set_outline_color (_color); + if (_track_canvas_line && !_selected) { _track_canvas_line->set_outline_color (_color); } @@ -487,7 +475,7 @@ void Marker::set_left_label_limit (double p) { /* Account for the size of the marker */ - _left_label_limit = p - 13; + _left_label_limit = p - marker_height; if (_left_label_limit < 0) { _left_label_limit = 0; } @@ -502,7 +490,7 @@ void Marker::set_right_label_limit (double p) { /* Account for the size of the marker */ - _right_label_limit = p - 13; + _right_label_limit = p - marker_height; if (_right_label_limit < 0) { _right_label_limit = 0; } @@ -514,7 +502,7 @@ Marker::set_right_label_limit (double p) /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, +TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::TempoSection& temp) : Marker (editor, parent, rgba, text, Tempo, 0, false), _tempo (temp) @@ -529,7 +517,7 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, +MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::MeterSection& m) : Marker (editor, parent, rgba, text, Meter, 0, false), _meter (m)