fix computation of Text bounding box to respect _clamped_width

[ardour.git] / gtk2_ardour / step_editor.cc

diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index 868787c8904338f6e9678af782f749b83c646cb0..4665da348b0079750b698937d300011329317eaa 100644 (file)
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "ardour/midi_track.h"
 #include "ardour/midi_region.h"
 #include "ardour/tempo.h"
@@ -63,7 +82,6 @@ StepEditor::start_step_editing ()
         step_edit_region_view->show_step_edit_cursor (step_edit_beat_pos);
         step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length());
 
-        step_editor->set_position (WIN_POS_MOUSE);
         step_editor->present ();
 }
 
@@ -123,7 +141,7 @@ StepEditor::reset_step_edit_beat_pos ()
                 frames_from_start = 0;
         }
 
-        step_edit_beat_pos = step_edit_region_view->frames_to_beats (frames_from_start);
+        step_edit_beat_pos = step_edit_region_view->region_frames_to_region_beats (frames_from_start);
         step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
 }
 
@@ -131,7 +149,7 @@ bool
 StepEditor::step_editor_hidden (GdkEventAny*)
 {
         step_editor_hide ();
-        return true;
+        return true; // XXX remember position ?!
 }
 
 void
@@ -210,9 +228,9 @@ StepEditor::move_step_edit_beat_pos (Evoral::MusicalTime beats)
 {
         if (beats > 0.0) {
                 step_edit_beat_pos = min (step_edit_beat_pos + beats,
-                                          step_edit_region_view->frames_to_beats (step_edit_region->length()));
+                                          step_edit_region_view->region_frames_to_region_beats (step_edit_region->length()));
         } else if (beats < 0.0) {
-                if (beats < step_edit_beat_pos) {
+                if (-beats < step_edit_beat_pos) {
                         step_edit_beat_pos += beats; // its negative, remember
                 } else {
                         step_edit_beat_pos = 0;
@@ -237,7 +255,9 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
         assert (step_edit_region);
         assert (step_edit_region_view);
 
-        if (beat_duration == 0.0) {
+        if (beat_duration == 0.0 && step_editor) {
+                beat_duration = step_editor->note_length();
+        } else if (beat_duration == 0.0) {
                 bool success;
                 beat_duration = _editor.get_grid_type_as_beats (success, step_edit_insert_position);
 
@@ -257,11 +277,10 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
 
         /* make sure its visible on the horizontal axis */
 
-        framepos_t fpos = step_edit_region->position() +
-                step_edit_region_view->beats_to_frames (step_edit_beat_pos + beat_duration);
+        framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (step_edit_beat_pos + beat_duration);
 
-        if (fpos >= (_editor.leftmost_position() + _editor.current_page_frames())) {
-                _editor.reset_x_origin (fpos - (_editor.current_page_frames()/4));
+        if (fpos >= (_editor.leftmost_sample() + _editor.current_page_samples())) {
+                _editor.reset_x_origin (fpos - (_editor.current_page_samples()/4));
         }
 
         Evoral::MusicalTime at = step_edit_beat_pos;
@@ -378,10 +397,9 @@ StepEditor::step_edit_bar_sync ()
                 return;
         }
 
-        framepos_t fpos = step_edit_region->position() +
-                step_edit_region_view->beats_to_frames (step_edit_beat_pos);
+        framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (step_edit_beat_pos);
         fpos = _session->tempo_map().round_to_bar (fpos, 1);
-        step_edit_beat_pos = ceil (step_edit_region_view->frames_to_beats (fpos - step_edit_region->position()));
+        step_edit_beat_pos = ceil (step_edit_region_view->region_frames_to_region_beats (fpos - step_edit_region->position()));
         step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
 }
 
@@ -390,7 +408,7 @@ StepEditor::playlist_changed ()
 {
         step_edit_region_connection.disconnect ();
         _track->playlist()->RegionRemoved.connect (step_edit_region_connection, invalidator (*this),
-                                                   ui_bind (&StepEditor::region_removed, this, _1),
+                                                   boost::bind (&StepEditor::region_removed, this, _1),
                                                    gui_context());
 }