smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

remove timebar canvas item from markers

Browse source
This commit is contained in:
Paul Davis 2014-05-21 19:13:58 -04:00
parent 22e7252729
commit ee8fb7758a
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gtk2_ardour/marker.cc
View file

@ -57,7 +57,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
: editor (ed) : editor (ed)
, _parent (&parent) , _parent (&parent)
, _time_bars_line (0)
, _track_canvas_line (0) , _track_canvas_line (0)
, _type (type) , _type (type)
, _selected (false) , _selected (false)
@ -299,7 +298,6 @@ Marker::~Marker ()
/* destroying the parent group destroys its contents, namely any polygons etc. that we added */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */
delete group; delete group;
delete _time_bars_line;
delete _track_canvas_line; delete _track_canvas_line;
} }
@ -328,29 +326,16 @@ Marker::setup_line ()
{ {
if (_shown && (_selected || _line_shown)) { 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()); _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_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->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)); _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 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 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_x0 (d.x);
_track_canvas_line->set_x1 (d.x); _track_canvas_line->set_x1 (d.x);
_track_canvas_line->set_y0 (d.y); _track_canvas_line->set_y0 (d.y);
@ -360,8 +345,7 @@ Marker::setup_line ()
_track_canvas_line->show (); _track_canvas_line->show ();
} else { } else {
if (_time_bars_line) { if (_track_canvas_line) {
_time_bars_line->hide ();
_track_canvas_line->hide (); _track_canvas_line->hide ();
} }
} }
@ -475,8 +459,7 @@ Marker::set_color_rgba (uint32_t c)
mark->set_fill_color (_color); mark->set_fill_color (_color);
mark->set_outline_color (_color); mark->set_outline_color (_color);
if (_time_bars_line && !_selected) { if (_track_canvas_line && !_selected) {
_time_bars_line->set_outline_color (_color);
_track_canvas_line->set_outline_color (_color); _track_canvas_line->set_outline_color (_color);
} }

1
gtk2_ardour/marker.h
View file

@ -103,7 +103,6 @@ class Marker : public sigc::trackable
ArdourCanvas::Polygon *mark; ArdourCanvas::Polygon *mark;
ArdourCanvas::Text *_name_item; ArdourCanvas::Text *_name_item;
ArdourCanvas::Points *points; ArdourCanvas::Points *points;
ArdourCanvas::Line* _time_bars_line;
ArdourCanvas::Line* _track_canvas_line; ArdourCanvas::Line* _track_canvas_line;
ArdourCanvas::Rectangle* _name_background; ArdourCanvas::Rectangle* _name_background;