return to the old way of editing track names, but hopefully better than it was. likel...

[ardour.git] / gtk2_ardour / editor_canvas.cc

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 87f42da5adcd53e5681793b98ba70e3a050f5c82..c0656ba90a6c44471dac1adb1172bbba2c31597a 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -106,6 +106,9 @@ Editor::initialize_canvas ()
                track_canvas = new ArdourCanvas::CanvasAA ();
        }
 
+       track_canvas->set_can_default (true);
+       set_default (*track_canvas);
+
        ArdourCanvas::init ();
        ardour_canvas_type_init ();
 
@@ -256,8 +259,8 @@ Editor::initialize_canvas ()
 
        track_canvas->set_name ("EditorMainCanvas");
        track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
-       track_canvas->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas));
-       track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas));
+       track_canvas->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas), false);
+       track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas), false);
        track_canvas->set_flags (CAN_FOCUS);
 
        /* set up drag-n-drop */
@@ -501,6 +504,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
@@ -732,6 +739,7 @@ Editor::left_track_canvas (GdkEventCrossing */*ev*/)
 {
        DropDownKeys ();
        within_track_canvas = false;
+       //cerr << "left track canvas\n";
        set_entered_track (0);
        set_entered_regionview (0);
        reset_canvas_action_sensitivity (false);
@@ -741,6 +749,7 @@ Editor::left_track_canvas (GdkEventCrossing */*ev*/)
 bool
 Editor::entered_track_canvas (GdkEventCrossing */*ev*/)
 {
+       //cerr << "entered track canvas\n";
        within_track_canvas = true;
        reset_canvas_action_sensitivity (true);
        return FALSE;