diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-26 15:07:29 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-26 15:10:24 -0400 |
| commit | 4e689d9496394e7218e1b09d0cef2a61f3791b62 (patch) | |
| tree | 1f6e11cdc7c55df744e739e7792a1bd50590afbe /gtk2_ardour/midi_region_view.cc | |
| parent | 3accf1d2af0834cb2c13df0e6de085a2ce7d521c (diff) | |
use new TrackingText for verbose cursor
Diffstat (limited to 'gtk2_ardour/midi_region_view.cc')
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 00cbad7733..a738b3c0c4 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -44,6 +44,7 @@ #include "evoral/midi_util.h" #include "canvas/debug.h" +#include "canvas/text.h" #include "automation_region_view.h" #include "automation_time_axis.h" @@ -3809,28 +3810,9 @@ MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const void MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double yoffset) const { - double wx, wy; - - trackview.editor().verbose_cursor()->set_text (text); - trackview.editor().get_pointer_position (wx, wy); - - wx += xoffset; - wy += yoffset; - - /* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */ - - boost::optional<ArdourCanvas::Rect> bbo = trackview.editor().verbose_cursor()->item().bounding_box(); - - assert (bbo); - - ArdourCanvas::Rect bb = bbo.get(); - - if ((wy + bb.y1 - bb.y0) > trackview.editor().visible_canvas_height()) { - wy -= (bb.y1 - bb.y0) + 2 * yoffset; - } - - trackview.editor().verbose_cursor()->set_position (wx, wy); + trackview.editor().verbose_cursor()->set (text); trackview.editor().verbose_cursor()->show (); + trackview.editor().verbose_cursor()->set_offset (ArdourCanvas::Duple (xoffset, yoffset)); } /** @param p A session framepos. |