Fix zoom cursor SNAFU (#274). Increase move threshold for zoom drags so that clicks...

[ardour.git] / gtk2_ardour / editor_mouse.cc

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 95fde99826656e12e42c8d8ec35889b984b50e90..f2d49fa1d711ce812f303b97bb75a697b2174777 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -270,7 +270,11 @@ Editor::set_canvas_cursor ()
                        break;
 
                case MouseZoom:
-                       current_canvas_cursor = zoom_in_cursor;
+                       if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
+                               current_canvas_cursor = zoom_out_cursor;
+                       } else {
+                               current_canvas_cursor = zoom_in_cursor;
+                       }
                        break;
 
                case MouseTimeFX:
@@ -1188,14 +1192,14 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                were_dragging = true;
        }
 
-        update_region_layering_order_editor (where);
+        update_region_layering_order_editor ();
 
        /* edit events get handled here */
 
        if (!_drags->active () && Keyboard::is_edit_event (&event->button)) {
                switch (item_type) {
                case RegionItem:
-                       edit_region ();
+                       show_region_properties ();
                        break;
 
                case TempoMarkerItem: