summaryrefslogtreecommitdiff
path: root/gtk2_ardour/verbose_cursor.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-04 18:45:27 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-04 18:45:27 -0400
commit19bd6419157119b976393a0c5966b4be4c962119 (patch)
treebf27f7ea6402f39a0f3744ed6b298d91ed7f7c0e /gtk2_ardour/verbose_cursor.cc
parentaaea166135ace01709f7e0be64f40be80f4107ec (diff)
commit immediately post linking
Diffstat (limited to 'gtk2_ardour/verbose_cursor.cc')
-rw-r--r--gtk2_ardour/verbose_cursor.cc24
1 files changed, 9 insertions, 15 deletions
diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index db9721beb4..1f43f754e6 100644
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -41,9 +41,11 @@ VerboseCursor::VerboseCursor (Editor* editor)
, _xoffset (0)
, _yoffset (0)
{
- _canvas_item = new ArdourCanvas::Text (*_editor->track_canvas->root());
- _canvas_item->property_font_desc() = get_font_for_style (N_("VerboseCanvasCursor"));
- _canvas_item->property_anchor() = Gtk::ANCHOR_NW;
+ _canvas_item = new ArdourCanvas::Text (_editor->_track_canvas->root());
+ _canvas_item->set_ignore_events (true);
+ _canvas_item->set_font_description (get_font_for_style (N_("VerboseCanvasCursor")));
+ // CAIROCANVAS
+ // _canvas_item->property_anchor() = Gtk::ANCHOR_NW;
}
ArdourCanvas::Item *
@@ -62,7 +64,7 @@ VerboseCursor::set (string const & text, double x, double y)
void
VerboseCursor::set_text (string const & text)
{
- _canvas_item->property_text() = text.c_str();
+ _canvas_item->set (text);
}
/** @param xoffset x offset to be applied on top of any set_position() call
@@ -94,22 +96,14 @@ VerboseCursor::hide ()
double
VerboseCursor::clamp_x (double x)
{
- if (x < 0) {
- x = 0;
- } else {
- x = min (_editor->_canvas_width - 200.0, x);
- }
+ _editor->clamp_verbose_cursor_x (x);
return x;
}
double
VerboseCursor::clamp_y (double y)
{
- if (y < _editor->canvas_timebars_vsize) {
- y = _editor->canvas_timebars_vsize;
- } else {
- y = min (_editor->_canvas_height - 50, y);
- }
+ _editor->clamp_verbose_cursor_y (y);
return y;
}
@@ -254,7 +248,7 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end, double x, double
void
VerboseCursor::set_color (uint32_t color)
{
- _canvas_item->set_fill_color (color);
+ _canvas_item->set_color (color);
}
/** Set the position of the verbose cursor. Any x/y offsets