X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas.cc;h=6f0e26aef65b3ca4a1381a2b4ad725823c328c09;hb=193a0c76711620d14ca2879281667dc1bef702b9;hp=152a8046c4aae6bb8bb38a15c11789d6ad75da43;hpb=6991a07902cc844b87c895aa56de613c96b88b4f;p=ardour.git

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 152a8046c4..6f0e26aef6 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -51,10 +51,11 @@
 #include "keyboard.h"
 #include "editor_cursors.h"
 #include "mouse_cursors.h"
+#include "note_base.h"
 #include "ui_config.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -313,7 +314,7 @@ Editor::reset_controls_layout_width ()
 	edit_controls_vbox.size_request (req);
 	w = req.width;
 
-        if (_group_tabs->is_mapped()) {
+        if (_group_tabs->is_visible()) {
 		_group_tabs->size_request (req);
                 w += req.width;
         }
@@ -462,7 +463,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
 		snap_to (frame);
 
 		bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
-#ifdef GTKOSX
+#ifdef __APPLE__
 		/* We are not allowed to call recursive main event loops from within
 		   the main event loop with GTK/Quartz. Since import/embed wants
 		   to push up a progress dialog, defer all this till we go idle.
@@ -638,6 +639,7 @@ Editor::autoscroll_canvas ()
 				scroll_up_one_track ();
 				vertical_motion = true;
 			}
+			no_stop = true;
 
 		} else if (y > autoscroll_boundary.y1) {
 
@@ -645,9 +647,9 @@ Editor::autoscroll_canvas ()
 				scroll_down_one_track ();
 				vertical_motion = true;
 			}
+			no_stop = true;
 		}
 
-		no_stop = true;
 	}
 
 	if (vc.pending || vertical_motion) {
@@ -757,7 +759,6 @@ Editor::start_canvas_autoscroll (bool allow_horiz, bool allow_vert, const Ardour
 
 	stop_canvas_autoscroll ();
 
-	autoscroll_cnt = 0;
 	autoscroll_horizontal_allowed = allow_horiz;
 	autoscroll_vertical_allowed = allow_vert;
 	autoscroll_boundary = boundary;
@@ -776,6 +777,7 @@ void
 Editor::stop_canvas_autoscroll ()
 {
 	autoscroll_connection.disconnect ();
+	autoscroll_cnt = 0;
 }
 
 Editor::EnterContext*
@@ -942,6 +944,8 @@ Editor::color_handler()
 
 	refresh_location_display ();
 
+	NoteBase::set_colors ();
+
 	/* redraw the whole thing */
 	_track_canvas->set_background_color (UIConfiguration::instance().color ("arrange base"));
 	_track_canvas->queue_draw ();