#include "utils.h"
#include "canvas_impl.h"
#include "simpleline.h"
+#include "simplerect.h"
+#include "rgb_macros.h"
#include <gtkmm2ext/utils.h>
PBD::Signal1<void,Marker*> Marker::CatchDeletion;
-Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& annotation,
- Type type, nframes_t frame, bool handle_events)
+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)
, _color (rgba)
, _left_label_limit (DBL_MAX)
, _right_label_limit (DBL_MAX)
+ , _label_offset (0)
{
- double label_offset = 0;
-
/* Shapes we use:
Mark:
| V
(0,5) (6,5)
\ /
- (3,10)
+ (3,13)
TempoMark:
points->push_back (Gnome::Art::Point (0.0, 0.0));
points->push_back (Gnome::Art::Point (6.0, 0.0));
points->push_back (Gnome::Art::Point (6.0, 5.0));
- points->push_back (Gnome::Art::Point (3.0, 10.0));
+ points->push_back (Gnome::Art::Point (3.0, 13.0));
points->push_back (Gnome::Art::Point (0.0, 5.0));
points->push_back (Gnome::Art::Point (0.0, 0.0));
_shift = 3;
- label_offset = 8.0;
+ _label_offset = 8.0;
break;
case Tempo:
points->push_back (Gnome::Art::Point (3.0, 0.0));
_shift = 3;
- label_offset = 8.0;
+ _label_offset = 8.0;
break;
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));
points->push_back (Gnome::Art::Point (0.0, 0.0));
_shift = 0;
- label_offset = 13.0;
+ _label_offset = 13.0;
break;
case SessionEnd:
points->push_back (Gnome::Art::Point (6.5, 6.5));
_shift = 13;
- label_offset = 6.0;
+ _label_offset = 6.0;
break;
case LoopStart:
points->push_back (Gnome::Art::Point (0.0, 0.0));
_shift = 0;
- label_offset = 12.0;
+ _label_offset = 12.0;
break;
case LoopEnd:
points->push_back (Gnome::Art::Point (13.0, 0.0));
_shift = 13;
- label_offset = 0.0;
+ _label_offset = 0.0;
break;
case PunchIn:
points->push_back (Gnome::Art::Point (0.0, 0.0));
_shift = 0;
- label_offset = 13.0;
+ _label_offset = 13.0;
break;
case PunchOut:
points->push_back (Gnome::Art::Point (0.0, 0.0));
_shift = 13;
- label_offset = 0.0;
+ _label_offset = 0.0;
break;
}
frame_position = frame;
unit_position = editor.frame_to_unit (frame);
+ unit_position -= _shift;
- /* adjust to properly locate the tip */
+ group = new Group (parent, unit_position, 0);
- unit_position -= _shift;
+ _name_background = new ArdourCanvas::SimpleRect (*group);
+ _name_background->property_outline_pixels() = 1;
- group = new Group (parent, unit_position, 1.0);
+ /* adjust to properly locate the tip */
- mark = new Polygon (*group);
+ mark = new ArdourCanvas::Polygon (*group);
mark->property_points() = *points;
set_color_rgba (rgba);
mark->property_width_pixels() = 1;
Glib::RefPtr<Pango::Layout> 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);
- name_pixbuf->property_x() = label_offset;
+ name_pixbuf->property_x() = _label_offset;
name_pixbuf->property_y() = (13/2) - (name_height/2);
set_name (annotation.c_str());
editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition));
mark->set_data ("marker", this);
+ _name_background->set_data ("marker", this);
if (handle_events) {
group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
CatchDeletion (this); /* EMIT SIGNAL */
/* destroying the parent group destroys its contents, namely any polygons etc. that we added */
- delete name_pixbuf;
- delete mark;
- delete points;
-
+ delete group;
delete _line;
}
void Marker::reparent(ArdourCanvas::Group & parent)
{
- group->reparent(parent);
+ group->reparent (parent);
_parent = &parent;
}
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 ();
{
_name = new_name;
- setup_name_pixbuf ();
+ setup_name_display ();
}
/** @return true if our label is on the left of the mark, otherwise false */
}
void
-Marker::setup_name_pixbuf ()
+Marker::setup_name_display ()
{
double limit = DBL_MAX;
-
+
if (label_on_left ()) {
limit = _left_label_limit;
} else {
}
/* 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;
}
}
name_pixbuf->property_pixbuf() = pixbuf_from_string (_name, name_font, name_width, name_height, Gdk::Color ("#000000"));
-}
-void
-Marker::setup_line_x ()
-{
- if (_line) {
- _line->property_x1() = unit_position + _shift - 0.5;
- _line->property_x2() = unit_position + _shift - 0.5;
+ if (label_on_left ()) {
+ _name_background->property_x1() = name_pixbuf->property_x() - 2;
+ _name_background->property_x2() = name_pixbuf->property_x() + name_width + _shift;
+ } else {
+ _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
group->move (new_unit_position - unit_position, 0.0);
frame_position = frame;
unit_position = new_unit_position;
-
- setup_line_x ();
}
void
Marker::show ()
{
_shown = true;
-
+
group->show ();
setup_line ();
}
Marker::hide ()
{
_shown = false;
-
+
group->hide ();
setup_line ();
}
_color = c;
mark->property_fill_color_rgba() = _color;
mark->property_outline_color_rgba() = _color;
+
if (_line && !_selected) {
_line->property_color_rgba() = _color;
}
+
+ _name_background->property_fill() = true;
+ _name_background->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (_color, 0x70);
+ _name_background->property_outline_color_rgba() = _color;
}
/** Set the number of pixels that are available for a label to the left of the centre of this marker */
if (_left_label_limit < 0) {
_left_label_limit = 0;
}
-
+
if (label_on_left ()) {
- setup_name_pixbuf ();
+ setup_name_display ();
}
}
if (_right_label_limit < 0) {
_right_label_limit = 0;
}
-
+
if (!label_on_left ()) {
- setup_name_pixbuf ();
+ setup_name_display ();
}
}
/***********************************************************************/
-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());
/***********************************************************************/
-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());
projects / ardour.git / blobdiff