summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-06-17 12:38:59 +0000
committerCarl Hetherington <carl@carlh.net>2012-06-17 12:38:59 +0000
commit2e71cb2e26371b41f0715c8d659218afa742dd33 (patch)
tree13edd729c14171fc7434534d23e7a5eed3f6b2a9 /gtk2_ardour
parent0c714fe3de350d2aed77f445d718e95ba9065b57 (diff)
Add option to disable autoscroll of editor (#4721).
git-svn-id: svn://localhost/ardour2/branches/3.0@12744 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_canvas.cc4
-rw-r--r--gtk2_ardour/rc_option_editor.cc8
2 files changed, 12 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 9e43fcc35c..3e7aad2a1b 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -501,6 +501,10 @@ Editor::autoscroll_fudge_threshold () const
void
Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool moving_left, bool moving_up)
{
+ if (!Config->get_autoscroll_editor ()) {
+ return;
+ }
+
bool startit = false;
/* Work out the distance between the right hand edge of the trackview and the edge of
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 4d12c8e739..7e91c0e7d9 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1150,6 +1150,14 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
));
+ add_option (_("Editor"),
+ new BoolOption (
+ "autoscroll-editor",
+ _("Auto-scroll editor window when dragging near its edges"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_autoscroll_editor),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_autoscroll_editor)
+ ));
+
/* AUDIO */
add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));