PBD::Signal1<void,Marker*> Marker::CatchDeletion;
+static const double marker_height = 13.0;
+
Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation,
Type type, framepos_t frame, bool handle_events)
| V
(0,5) (6,5)
\ /
- (3,13)
+ (3,marker_height)
TempoMark:
PunchIn:
- 0,0 ------> 13,0
+ 0,0 ------> marker_height,0
| /
| /
| /
| /
| /
| /
- 0,13
+ 0,marker_height
PunchOut
- 0,0 -->-13,0
+ 0,0 -->-marker_height,0
\ |
\ |
\ |
\ |
\ |
\ |
- 13,13
+ marker_height,marker_height
*/
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 (3.0, marker_height));
points->push_back (ArdourCanvas::Duple (0.0, 5.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 (6.5, 6.5));
- points->push_back (ArdourCanvas::Duple (0.0, 13.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 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 (marker_height, 0.0));
+ points->push_back (ArdourCanvas::Duple (marker_height, marker_height));
points->push_back (ArdourCanvas::Duple (6.5, 6.5));
- _shift = 13;
+ _shift = marker_height;
_label_offset = 6.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;
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:
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:
points->push_back (ArdourCanvas::Duple (12.0, 12.0));
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
- _shift = 13;
+ _shift = marker_height;
_label_offset = 0.0;
break;
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));
- _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0)));
+ _name_item->set_position (ArdourCanvas::Duple (_label_offset, (marker_height / 2.0) - (name_height / 2.0) - 2.0));
set_name (annotation.c_str());
int name_width = min ((double) pixel_width (_name, name_font) + 2, limit);
if (name_width == 0) {
- name_width = 1;
- }
-
- if (label_on_left ()) {
- _name_item->set_x_position (-name_width);
- }
-
- _name_item->set (_name);
-
- // CAIROCANVAS
- // need to "clip" name to name_width and name_height
-
- if (label_on_left ()) {
- _name_background->set_x0 (_name_item->position().x - 2);
- _name_background->set_x1 (_name_item->position().x + name_width + _shift);
+ _name_item->hide ();
} else {
- _name_background->set_x0 (_name_item->position().x - _label_offset + 2);
- _name_background->set_x1 (_name_item->position().x + name_width);
+ _name_item->show ();
+
+ if (label_on_left ()) {
+ _name_item->set_x_position (-name_width);
+ }
+
+ _name_item->clamp_width (name_width);
+ _name_item->set (_name);
+
+ 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_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_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;
}
Marker::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;
}