diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-25 21:56:10 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-25 21:56:10 -0400 |
| commit | 2b74c955f1e10896cc28c3937b884ad4723c0476 (patch) | |
| tree | bfc75626c9259be5a5b7640cf15b6ff4ab0f54f8 /gtk2_ardour/editor.cc | |
| parent | 57ff5e3198a9c6892629a9d56e65887aadf7cc84 (diff) | |
fix zoom focus issue that was messing up zoom changes
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 3318bf91ce..ab2b96439a 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2265,7 +2265,6 @@ Editor::set_state (const XMLNode& node, int /*version*/) if ((prop = node.property ("zoom"))) { /* older versions of ardour used floating point samples_per_pixel */ double f = PBD::atof (prop->value()); - cerr << "LOADED ZOOM from " << prop->value() << " as " << f << endl; reset_zoom (llrintf (f)); } else { reset_zoom (samples_per_pixel); @@ -4329,6 +4328,7 @@ Editor::idle_visual_changer () double const last_time_origin = horizontal_position (); + if (p & VisualChange::ZoomLevel) { set_samples_per_pixel (pending_visual_change.samples_per_pixel); @@ -4342,9 +4342,7 @@ Editor::idle_visual_changer () compute_bbt_ruler_scale (pending_visual_change.time_origin, pending_visual_change.time_origin + current_page_samples(), current_bbt_points_begin, current_bbt_points_end); update_tempo_based_rulers (current_bbt_points_begin, current_bbt_points_end); - } - if (p & VisualChange::ZoomLevel) { update_video_timeline(); } |