Assortment of minor changes from 2.0-ongoing.

git-svn-id: svn://localhost/ardour2/branches/3.0@3852 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 9 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 8d1332c55d..5c7c679d72 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1321,8 +1321,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 			at_x = cp->get_x();
 			at_y = cp->get_y ();
 			cp->item()->i2w (at_x, at_y);
-			at_x += 20.0;
-			at_y += 20.0;
+			at_x += 10.0;
+			at_y += 10.0;
 
 			fraction = 1.0 - (cp->get_y() / cp->line().height());
 
@@ -2275,11 +2275,14 @@ Editor::cursor_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	if (adjusted_frame == drag_info.last_pointer_frame) return;
 
 	cursor->set_position (adjusted_frame);
-	
-	UpdateAllTransportClocks (cursor->current_frame);
 
 	show_verbose_time_cursor (cursor->current_frame, 10);
 
+#ifdef GTKOSX
+	track_canvas->update_now ();
+#endif
+	UpdateAllTransportClocks (cursor->current_frame);
+
 	drag_info.last_pointer_frame = adjusted_frame;
 	drag_info.first_move = false;
 }
@@ -2310,8 +2313,7 @@ Editor::update_marker_drag_item (Location *location)
 		marker_drag_line_points.front().set_x(x1);
 		marker_drag_line_points.back().set_x(x1);
 		marker_drag_line->property_points() = marker_drag_line_points;
-	}
-	else {
+	} else {
 		range_marker_drag_rect->property_x1() = x1;
 		range_marker_drag_rect->property_x2() = x2;
 	}
@@ -2418,7 +2420,7 @@ Editor::start_marker_grab (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 {
-	nframes64_t f_delta;	
+	nframes64_t f_delta = 0;
 	nframes64_t newframe;
 	bool is_start;
 	bool move_both = false;
@@ -2576,6 +2578,7 @@ Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 #ifdef GTKOSX
 	track_canvas->update_now ();
 #endif
+	edit_point_clock.set (copy_location->start());
 }
 
 void
@@ -2967,7 +2970,7 @@ Editor::start_control_point_grab (ArdourCanvas::Item* item, GdkEvent* event)
 
 	float fraction = 1.0 - (control_point->get_y() / control_point->line().height());
 	set_verbose_canvas_cursor (control_point->line().get_verbose_cursor_string (fraction), 
-				   drag_info.current_pointer_x + 20, drag_info.current_pointer_y + 20);
+				   drag_info.current_pointer_x + 10, drag_info.current_pointer_y + 10);
 
 	show_verbose_canvas_cursor ();
 }
@@ -3119,7 +3122,7 @@ Editor::start_line_grab (AutomationLine* line, GdkEvent* event)
 	line->start_drag (0, drag_info.grab_frame, fraction);
 	
 	set_verbose_canvas_cursor (line->get_verbose_cursor_string (fraction),
-				   drag_info.current_pointer_x + 20, drag_info.current_pointer_y + 20);
+				   drag_info.current_pointer_x + 10, drag_info.current_pointer_y + 10);
 	show_verbose_canvas_cursor ();
 }