diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-17 21:23:30 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-17 21:23:30 -0400 |
| commit | fd23ebd0886cd61f8ee68d52d6576d00a16c9032 (patch) | |
| tree | 3266dfd8b1deefc1b8ec60f0c9098d99ecac966c /gtk2_ardour/editor.cc | |
| parent | 5e0e41e068a04603198a4e50464d794156f42c47 (diff) | |
| parent | 402d92889a358949af3ea7ad0dd5be88a5652626 (diff) | |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c140ef71ab..c7bdfc15da 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -369,6 +369,7 @@ Editor::Editor () location_loop_color = ARDOUR_UI::config()->get_canvasvar_LocationLoop(); location_punch_color = ARDOUR_UI::config()->get_canvasvar_LocationPunch(); + zoom_focus = ZoomFocusLeft; _edit_point = EditAtMouse; _internal_editing = false; current_canvas_cursor = 0; @@ -377,8 +378,6 @@ Editor::Editor () _scroll_callbacks = 0; - zoom_focus = ZoomFocusLeft; - set_zoom_focus (ZoomFocusLeft); zoom_range_clock->ValueChanged.connect (sigc::mem_fun(*this, &Editor::zoom_adjustment_changed)); bbt_label.set_name ("EditorRulerLabel"); @@ -636,6 +635,7 @@ Editor::Editor () setup_toolbar (); + set_zoom_focus (zoom_focus); _snap_type = SnapToBeat; set_snap_to (_snap_type); _snap_mode = SnapOff; |