X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=351267af545eee2c452b7912e81cedf5b1440fe9;hb=5905b58bc0ad8383ef16631b6505c288c550192a;hp=6f0898d5dc0a60d345e0b9cd3674b805ae00969a;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 6f0898d5dc..351267af54 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -45,12 +45,11 @@ using namespace Gtkmm2ext; PBD::Signal1 Marker::CatchDeletion; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& annotation, +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) @@ -163,7 +162,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro 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)); @@ -235,7 +234,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro frame_position = frame; unit_position = editor.frame_to_unit (frame); unit_position -= _shift; - + group = new Group (parent, unit_position, 1.0); _name_background = new ArdourCanvas::SimpleRect (*group); @@ -256,7 +255,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ int width; - layout->set_font_description (*name_font); + layout->set_font_description (name_font); Gtkmm2ext::get_ink_pixel_size (layout, width, name_height); name_pixbuf = new ArdourCanvas::Pixbuf(*group); @@ -288,7 +287,7 @@ Marker::~Marker () void Marker::reparent(ArdourCanvas::Group & parent) { - group->reparent(parent); + group->reparent (parent); _parent = &parent; } @@ -313,24 +312,22 @@ Marker::setup_line () if (_line == 0) { - _line = new ArdourCanvas::SimpleLine (*_line_parent); + _line = new ArdourCanvas::SimpleLine (*group); _line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); - setup_line_x (); - _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 + 10; - _line->property_y2() = yo + 10 + _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 (); @@ -375,7 +372,7 @@ void Marker::setup_name_display () { double limit = DBL_MAX; - + if (label_on_left ()) { limit = _left_label_limit; } else { @@ -383,7 +380,7 @@ Marker::setup_name_display () } /* Work out how wide the name can be */ - int name_width = min ((double) pixel_width (_name, *name_font) + 2, limit); + int name_width = min ((double) pixel_width (_name, name_font) + 2, limit); if (name_width == 0) { name_width = 1; } @@ -401,20 +398,11 @@ Marker::setup_name_display () _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::setup_line_x () -{ - if (_line) { - _line->property_x1() = unit_position + _shift - 0.5; - _line->property_x2() = unit_position + _shift - 0.5; - } -} - void Marker::set_position (framepos_t frame) { @@ -423,8 +411,6 @@ Marker::set_position (framepos_t frame) group->move (new_unit_position - unit_position, 0.0); frame_position = frame; unit_position = new_unit_position; - - setup_line_x (); } void @@ -437,7 +423,7 @@ void Marker::show () { _shown = true; - + group->show (); setup_line (); } @@ -446,7 +432,7 @@ void Marker::hide () { _shown = false; - + group->hide (); setup_line (); } @@ -460,12 +446,6 @@ Marker::set_color_rgba (uint32_t c) if (_line && !_selected) { _line->property_color_rgba() = _color; - - /* For reasons unknown this is necessary to ensure that the line colour - gets updated. - */ - _line->hide (); - _line->show (); } _name_background->property_fill() = true; @@ -482,7 +462,7 @@ Marker::set_left_label_limit (double p) if (_left_label_limit < 0) { _left_label_limit = 0; } - + if (label_on_left ()) { setup_name_display (); } @@ -497,7 +477,7 @@ Marker::set_right_label_limit (double p) if (_right_label_limit < 0) { _right_label_limit = 0; } - + if (!label_on_left ()) { setup_name_display (); } @@ -505,9 +485,9 @@ Marker::set_right_label_limit (double p) /***********************************************************************/ -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()); @@ -520,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());