X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=87c0c06ab20d260ff23f069505ab6bc6d4d324ab;hb=822810b88fd13d1764b5f686baa8edb3e27e95fc;hp=652a43657e1ebe273fe3765329d9d19c04f92541;hpb=ea1ccb869a152d7344f498d2a062867f5bcf9d0b;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 652a43657e..87c0c06ab2 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -21,18 +21,23 @@ #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" +#include "ui_config.h" /* * ardour_ui.h include was moved to the top of the list * due to a conflicting definition of 'Rect' between * Apple's MacTypes.h and GTK. + * + * Now that we are including ui_config.h and not ardour_ui.h + * the above comment may no longer apply and this comment + * can be removed and ui_config.h inclusion moved. */ #include "marker.h" @@ -42,20 +47,27 @@ #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace Gtkmm2ext; -PBD::Signal1 Marker::CatchDeletion; +PBD::Signal1 ArdourMarker::CatchDeletion; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, +static double marker_height = 13.0; + +void ArdourMarker::setup_sizes(const double timebar_height) +{ + marker_height = floor (timebar_height) - 2; +} + +ArdourMarker::ArdourMarker (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) @@ -67,99 +79,106 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con , _label_offset (0) { - /* Shapes we use: - - Mark: - - (0,0) -> (6,0) - ^ | - | V - (0,5) (6,5) - \ / - (3,13) - - - TempoMark: - MeterMark: - - (3,0) - / \ - (0,5) -> (6,5) - ^ | - | V - (0,10)<-(6,10) - - - Start: - - 0,0\ - | \ - | \ 6,6 - | / - | / - 0,12 - End: + const double MH = marker_height - 1; + const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale())); + const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale())); - /12,0 - / | - / | - 6,6 | - \ | - \ | - \ | - 12,12 - - PunchIn: - - 0,0 ------> 13,0 - | / - | / - | / - | / - | / - | / - 0,13 - - PunchOut - - 0,0 -->-13,0 - \ | - \ | - \ | - \ | - \ | - \ | - 13,13 - - - */ + /* Shapes we use: + * + * Mark: + * + * (0,0) -> (6,0) + * ^ | + * | V + * (0,MH*.4) (6,MH*.4) + * \ / + * (3,MH) + * + * + * TempoMark: + * MeterMark: + * + * (3,0) + * / \ + * (0,MH*.6) (6,MH.*.6) + * ^ | + * | V + * (0,MH) <- (6,MH) + * + * + * SessionStart: + * RangeStart: + * + * 0,0\ + * | \ + * | \ 6,MH/2 + * | / + * | / + * 0,MH + * + * + * SessionEnd: + * RangeEnd: + * + * /12,0 + * / | + * 6,MH/2/ | + * \ | + * \ | + * \12,MH + * + * + * PunchIn: + * + * 0,0 ------> marker_height,0 + * | / + * | / + * | / + * | / + * | / + * | / + * 0,marker_height + * + * + * PunchOut + * + * 0,0 ------> marker_height,0 + * \ | + * \ | + * \ | + * \ | + * \ | + * \ | + * \ | + * marker_height,marker_height + * + */ switch (type) { case Mark: points = new ArdourCanvas::Points (); 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 (0.0, 5.0)); + points->push_back (ArdourCanvas::Duple ( M6, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, MH * .4)); + points->push_back (ArdourCanvas::Duple ( M3, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH * .4)); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); _shift = 3; - _label_offset = 8.0; + _label_offset = 10.0; break; case Tempo: case Meter: - points = new ArdourCanvas::Points (); - points->push_back (ArdourCanvas::Duple (3.0, 0.0)); - points->push_back (ArdourCanvas::Duple (6.0, 5.0)); - points->push_back (ArdourCanvas::Duple (6.0, 10.0)); - points->push_back (ArdourCanvas::Duple (0.0, 10.0)); - points->push_back (ArdourCanvas::Duple (0.0, 5.0)); - points->push_back (ArdourCanvas::Duple (3.0, 0.0)); + points->push_back (ArdourCanvas::Duple ( M3, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, MH * .6)); + points->push_back (ArdourCanvas::Duple ( M6, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH * .6)); + points->push_back (ArdourCanvas::Duple ( M3, 0.0)); _shift = 3; _label_offset = 8.0; @@ -167,70 +186,69 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con case SessionStart: case RangeStart: - - 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, 0.0)); + points = new ArdourCanvas::Points (); + points->push_back (ArdourCanvas::Duple ( 0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (M6 + .5, MH * .5)); + points->push_back (ArdourCanvas::Duple ( 0.0, MH)); + points->push_back (ArdourCanvas::Duple ( 0.0, 0.0)); _shift = 0; - _label_offset = 13.0; + _label_offset = 8.0; 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 (6.5, 6.5)); + points = new ArdourCanvas::Points (); // leaks + points->push_back (ArdourCanvas::Duple ( M6, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH * .5)); + points->push_back (ArdourCanvas::Duple ( M6, 0.0)); - _shift = 13; - _label_offset = 6.0; + _shift = M6; + _label_offset = 0.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; - _label_offset = 12.0; + _label_offset = marker_height; break; 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: + 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: + case PunchOut: points = new ArdourCanvas::Points (); points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - points->push_back (ArdourCanvas::Duple (12.0, 0.0)); - points->push_back (ArdourCanvas::Duple (12.0, 12.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, 0.0)); - _shift = 13; + _shift = marker_height; _label_offset = 0.0; break; @@ -240,15 +258,15 @@ 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 +#endif _name_background = new ArdourCanvas::Rectangle (group); #ifdef CANVAS_DEBUG _name_background->name = string_compose ("Marker::_name_background for %1", annotation); -#endif +#endif /* adjust to properly locate the tip */ @@ -268,16 +286,16 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con layout->set_font_description (name_font); 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)); + CANVAS_DEBUG_NAME (_name_item, string_compose ("ArdourMarker::_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 - name_height - 1) * .5 )); set_name (annotation.c_str()); - editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); + editor.ZoomChanged.connect (sigc::mem_fun (*this, &ArdourMarker::reposition)); /* events will be handled by both the group and the mark itself, so * make sure they can both be used to lookup this object. @@ -285,101 +303,87 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con group->set_data ("marker", this); mark->set_data ("marker", this); - + if (handle_events) { group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } } -Marker::~Marker () +ArdourMarker::~ArdourMarker () { CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ delete group; - delete _time_bars_line; delete _track_canvas_line; + delete points; } -void Marker::reparent(ArdourCanvas::Group & parent) +void ArdourMarker::reparent(ArdourCanvas::Container & parent) { group->reparent (&parent); _parent = &parent; } void -Marker::set_selected (bool s) +ArdourMarker::set_selected (bool s) { _selected = s; setup_line (); } void -Marker::set_show_line (bool s) +ArdourMarker::set_show_line (bool s) { _line_shown = s; setup_line (); } void -Marker::setup_line () +ArdourMarker::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->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint()); + _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group()); + _track_canvas_line->set_outline_color (UIConfiguration::instance().color ("edit point")); _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); _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->set_outline_color (_selected ? UIConfiguration::instance().color ("edit point") : _color); _track_canvas_line->raise_to_top (); _track_canvas_line->show (); } else { - if (_time_bars_line) { - _time_bars_line->hide (); + if (_track_canvas_line) { _track_canvas_line->hide (); } } } void -Marker::canvas_height_set (double h) +ArdourMarker::canvas_height_set (double h) { _canvas_height = h; setup_line (); } ArdourCanvas::Item& -Marker::the_item() const +ArdourMarker::the_item() const { return *group; } void -Marker::set_name (const string& new_name) +ArdourMarker::set_name (const string& new_name) { _name = new_name; @@ -388,13 +392,13 @@ Marker::set_name (const string& new_name) /** @return true if our label is on the left of the mark, otherwise false */ bool -Marker::label_on_left () const +ArdourMarker::label_on_left () const { return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); } void -Marker::setup_name_display () +ArdourMarker::setup_name_display () { double limit = DBL_MAX; @@ -404,36 +408,42 @@ Marker::setup_name_display () limit = _right_label_limit; } + const float padding = std::max(2.f, rintf(2.f * UIConfiguration::instance().get_ui_scale())); + /* 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) + padding, limit); if (name_width == 0) { - name_width = 1; - } - - if (label_on_left ()) { - _name_item->set_x_position (-name_width); - } - - _name_item->set (_name); + _name_item->hide (); + } else { + _name_item->show (); - // CAIROCANVAS - // need to "clip" name to name_width and name_height + if (label_on_left ()) { + _name_item->set_x_position (-name_width); + } - 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_item->clamp_width (name_width); + _name_item->set (_name); + + if (label_on_left ()) { + /* adjust right edge of background to fit text */ + _name_background->set_x0 (_name_item->position().x - padding); + _name_background->set_x1 (_name_item->position().x + name_width + _shift); + } else { + /* right edge remains at zero (group-relative). Add + * arbitrary 2 pixels of extra padding at the end + */ + _name_background->set_x1 (_name_item->position().x + name_width + padding); + } } _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 -Marker::set_position (framepos_t frame) +ArdourMarker::set_position (framepos_t frame) { unit_position = editor.sample_to_pixel (frame) - _shift; group->set_x_position (unit_position); @@ -442,13 +452,13 @@ Marker::set_position (framepos_t frame) } void -Marker::reposition () +ArdourMarker::reposition () { set_position (frame_position); } void -Marker::show () +ArdourMarker::show () { _shown = true; @@ -457,7 +467,7 @@ Marker::show () } void -Marker::hide () +ArdourMarker::hide () { _shown = false; @@ -466,14 +476,13 @@ Marker::hide () } void -Marker::set_color_rgba (uint32_t c) +ArdourMarker::set_color_rgba (uint32_t c) { _color = 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); } @@ -484,10 +493,10 @@ Marker::set_color_rgba (uint32_t c) /** 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) +ArdourMarker::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; } @@ -499,10 +508,10 @@ Marker::set_left_label_limit (double p) /** 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) +ArdourMarker::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,9 +523,9 @@ 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), + : ArdourMarker (editor, parent, rgba, text, Tempo, 0, false), _tempo (temp) { set_position (_tempo.frame()); @@ -527,11 +536,31 @@ TempoMarker::~TempoMarker () { } +void +TempoMarker::update_height_mark (const double& ratio) +{ + const double MH = marker_height; + const double top = MH * (1 - ratio); + const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale())); + const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale())); + + delete points; + points = new ArdourCanvas::Points (); + points->push_back (ArdourCanvas::Duple ( M3, top)); + points->push_back (ArdourCanvas::Duple ( M6, min (top + (MH * .6), MH))); + points->push_back (ArdourCanvas::Duple ( M6, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (0.0, min (top + (MH * .6), MH))); + points->push_back (ArdourCanvas::Duple ( M3, top)); + + mark->set (*points); +} + /***********************************************************************/ -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), + : ArdourMarker (editor, parent, rgba, text, Meter, 0, false), _meter (m) { set_position (_meter.frame());