ardour/livetrax
13
0
Fork 0
Code

fix up positioning of verbose cursor if it is too close to the bottom of the canvas (for MidiRegionView)

Browse Source
This commit is contained in:
Paul Davis 2013-04-11 20:01:14 -04:00
parent ae2b39b2e3
commit 1fda7b293a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/midi_region_view.cc
View File

@ -3820,6 +3820,7 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double
{ {
double wx, wy; double wx, wy;
trackview.editor().verbose_cursor()->set_text (text);
trackview.editor().get_pointer_position (wx, wy); trackview.editor().get_pointer_position (wx, wy);
wx += xoffset; wx += xoffset;
@ -3827,13 +3828,17 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double
/* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */ /* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */
ArdourCanvas::Rect bb = trackview.editor().verbose_cursor()->item().bounding_box().get(); 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()) { if ((wy + bb.y1 - bb.y0) > trackview.editor().visible_canvas_height()) {
wy -= (bb.y1 - bb.y0) + 2 * yoffset; wy -= (bb.y1 - bb.y0) + 2 * yoffset;
} }
trackview.editor().verbose_cursor()->set (text, wx, wy); trackview.editor().verbose_cursor()->set_position (wx, wy);
trackview.editor().verbose_cursor()->show (); trackview.editor().verbose_cursor()->show ();
} }