X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=652a43657e1ebe273fe3765329d9d19c04f92541;hb=fa71d82dda08558caf4a9c5102016f2746883d10;hp=59ed01f1772d65478991000a579eab9e7ff3f6c7;hpb=7e19053b88b4ab174052a44f2ee99dce92517aa9;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 59ed01f177..652a43657e 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -19,11 +19,14 @@ #include #include "ardour/tempo.h" + #include "canvas/rectangle.h" #include "canvas/group.h" #include "canvas/line.h" #include "canvas/polygon.h" #include "canvas/text.h" +#include "canvas/canvas.h" +#include "canvas/debug.h" #include "ardour_ui.h" /* @@ -52,12 +55,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con : editor (ed) , _parent (&parent) - , _line (0) + , _time_bars_line (0) + , _track_canvas_line (0) , _type (type) , _selected (false) , _shown (false) , _line_shown (false) - , _canvas_height (0) , _color (rgba) , _left_label_limit (DBL_MAX) , _right_label_limit (DBL_MAX) @@ -246,17 +249,14 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con #ifdef CANVAS_DEBUG _name_background->name = string_compose ("Marker::_name_background for %1", annotation); #endif - _name_background->set_outline_width (1); /* adjust to properly locate the tip */ mark = new ArdourCanvas::Polygon (group); -#ifdef CANVAS_DEBUG - mark->name = string_compose ("Marker::mark for %1", annotation); -#endif + CANVAS_DEBUG_NAME (mark, string_compose ("Marker::mark for %1", annotation)); + mark->set (*points); set_color_rgba (rgba); - mark->set_outline_width (1); /* setup name pixbuf sizes */ name_font = get_font_for_style (N_("MarkerText")); @@ -270,13 +270,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con Gtkmm2ext::get_ink_pixel_size (layout, width, name_height); _name_item = new ArdourCanvas::Text (group); + 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)); - -#ifdef CANVAS_DEBUG - _name_item->name = string_compose ("Marker::_name_item for %1", annotation); -#endif - _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0))); + _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0) - 2.0)); set_name (annotation.c_str()); @@ -292,7 +289,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con if (handle_events) { group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } - } Marker::~Marker () @@ -301,7 +297,8 @@ Marker::~Marker () /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ delete group; - delete _line; + delete _time_bars_line; + delete _track_canvas_line; } void Marker::reparent(ArdourCanvas::Group & parent) @@ -329,32 +326,41 @@ Marker::setup_line () { if (_shown && (_selected || _line_shown)) { - if (_line == 0) { - - _line = new ArdourCanvas::Line (group); - _line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get()); + if (_time_bars_line == 0) { - _line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); + _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->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)); } - /* work out where to start the line from so that it extends from the top of the canvas */ - double yo = 0; - double xo = 0; - - _line->item_to_canvas (xo, yo); - - _line->set_x0 (_shift); - _line->set_x1 (_shift); - _line->set_y0 (-yo); // zero in world coordinates, negative in item/parent coordinate space - _line->set_y1 (-yo + _canvas_height); - - _line->set_outline_color (_selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color); - _line->raise_to_top (); - _line->show (); + 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)); + + _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); + _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->raise_to_top (); + _track_canvas_line->show (); } else { - if (_line) { - _line->hide (); + if (_time_bars_line) { + _time_bars_line->hide (); + _track_canvas_line->hide (); } } } @@ -431,6 +437,7 @@ Marker::set_position (framepos_t frame) { unit_position = editor.sample_to_pixel (frame) - _shift; group->set_x_position (unit_position); + setup_line (); frame_position = frame; } @@ -465,8 +472,9 @@ Marker::set_color_rgba (uint32_t c) mark->set_fill_color (_color); mark->set_outline_color (_color); - if (_line && !_selected) { - _line->set_outline_color (_color); + if (_time_bars_line && !_selected) { + _time_bars_line->set_outline_color (_color); + _track_canvas_line->set_outline_color (_color); } _name_background->set_fill (true);